Ros-diffs October 2007

ros-diffs@reactos.org

20 participants
708 discussions

[janderwald] 29358: - implement drive extra dialog
by janderwald＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: janderwald Date: Tue Oct 2 21:41:48 2007 New Revision: 29358 URL: http://svn.reactos.org/svn/reactos?rev=29358&view=rev Log: - implement drive extra dialog Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/shell32_De.rc 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 (original) +++ trunk/reactos/dll/win32/shell32/drive.c Tue Oct 2 21:41:48 2007 @@ -266,7 +266,60 @@ LPARAM lParam ) { - + STARTUPINFOW si; + PROCESS_INFORMATION pi; + WCHAR szPath[MAX_PATH]; + WCHAR szArg[MAX_PATH]; + WCHAR * szDrive; + UINT length; + LPPROPSHEETPAGEW ppsp; + + switch (uMsg) + { + case WM_INITDIALOG: + ppsp = (LPPROPSHEETPAGEW)lParam; + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)ppsp->lParam); + return TRUE; + case WM_COMMAND: + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + if (!GetSystemDirectoryW(szPath, MAX_PATH)) + break; + szDrive = (WCHAR*)GetWindowLongPtr(hwndDlg, DWLP_USER); + switch(LOWORD(wParam)) + { + case 14000: + /// + /// FIXME + /// show checkdsk dialog + /// + break; + case 14001: + szArg[0] = L'"'; + wcscpy(&szArg[1], szPath); + wcscat(szPath, L"\\mmc.exe"); + wcscat(szArg, L"\\dfrg.msc\" "); + length = wcslen(szArg); + szArg[length] = szDrive[0]; + szArg[length+1] = L':'; + szArg[length+2] = L'\0'; + if (CreateProcessW(szPath, szArg, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + break; + case 14002: + wcscat(szPath, L"\\ntbackup.exe"); + if (CreateProcessW(szPath, NULL, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) + { + CloseHandle(pi.hProcess); + CloseHandle(pi.hThread); + } + } + break; + } return FALSE; } Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Tue Oct 2 21:41:48 2007 @@ -252,15 +252,24 @@ CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 15, 220, 165, 10, WS_DISABLED } -DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 +DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Extras" FONT 8, "MS Shell Dlg", 0, 0, 0x0 { -} - - -DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 130 + GROUPBOX "Fehlerüberprüfung", -1, 5, 5, 230, 60 + LTEXT "Bei Wahl dieser Option wird das Volume\nauf Fehler überprüft.", -1, 40, 25, 160, 20 + PUSHBUTTON "Jetzt &prüfen", 14000, 130, 45, 90, 15, WS_TABSTOP + GROUPBOX "Defragmentierung", -1, 5, 65, 230, 60 + LTEXT "Bei Wahl dieser Option werden die Dateien auf\ndem Volume defragmentiert.", -1, 40, 85, 160, 20 + PUSHBUTTON "Jetzt &defragmentieren", 14001, 130, 105, 90, 15, WS_TABSTOP + GROUPBOX "Sicherung", -1, 5, 130, 230, 60 + LTEXT "Bei Wahl dieser Option werden die auf dem\nVolume gespeicherten Dateien gesichert.", -1, 40, 150, 160, 20 + PUSHBUTTON "Jetzt &sichern", 14002, 130, 170, 90, 15, WS_TABSTOP +} + + +DRIVE_HARDWARE_DLG DIALOGEX 0, 0, 240, 230 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Hardware" FONT 8, "MS Shell Dlg", 0, 0, 0x0

1 0

[janderwald] 29357: - remove superflious calls to sysreg
by janderwald＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: janderwald Date: Tue Oct 2 20:10:11 2007 New Revision: 29357 URL: http://svn.reactos.org/svn/reactos?rev=29357&view=rev Log: - remove superflious calls to sysreg Modified: trunk/reactos/Makefile Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=29357&r1=2935… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Tue Oct 2 20:10:11 2007 @@ -436,8 +436,7 @@ sysregtest: $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg - $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg - $(OUTPUT_)tools$(SEP)sysreg$(SEP)sysreg$(EXEPOSTFIX) tools$(SEP)sysreg$(SEP)txtmode.cfg + .PHONY: cb cb: $(RBUILD_TARGET)

1 0

[janderwald] 29356: - perform all boot tests in one launch of sysreg - check for timeouts in windows version to see if qemu has hung
by janderwald＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: janderwald Date: Tue Oct 2 20:09:29 2007 New Revision: 29356 URL: http://svn.reactos.org/svn/reactos?rev=29356&view=rev Log: - perform all boot tests in one launch of sysreg - check for timeouts in windows version to see if qemu has hung Modified: trunk/reactos/tools/sysreg/os_support.cpp trunk/reactos/tools/sysreg/os_support.h trunk/reactos/tools/sysreg/rosboot_test.cpp trunk/reactos/tools/sysreg/rosboot_test.h trunk/reactos/tools/sysreg/sysreg.cpp trunk/reactos/tools/sysreg/txtmode.cfg Modified: trunk/reactos/tools/sysreg/os_support.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.cp… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.cpp (original) +++ trunk/reactos/tools/sysreg/os_support.cpp Tue Oct 2 20:09:29 2007 @@ -11,8 +11,63 @@ namespace System_ { + + OsSupport::TimeEntryVector OsSupport::s_Entries; + + void OsSupport::checkAlarms() + { + struct timeval tm; + gettimeofday(&tm, 0); + for (size_t i = 0; i < s_Entries.size(); i++) + { + long diffsec = s_Entries[i]->tm.tv_sec - tm.tv_sec; + if (diffsec < 0) + { + cout << "terminating process pid:" << s_Entries[i]->pid << endl; + terminateProcess(s_Entries[i]->pid, -2); + free(s_Entries[i]); + s_Entries.erase (s_Entries.begin () + i); + i = MAX(0, i-1); + } + } + +#ifdef __LINUX__ + if (s_Entries.size()) + { + long secs = Entries[i]->tm.tv_sec - tm.tv_sec; + alarm(secs); + } +#endif + } + + void OsSupport::cancelAlarms() + { + #ifndef __LINUX__ - bool OsSupport::terminateProcess(OsSupport::ProcessID pid) + if (s_hThread) + { + TerminateThread(s_hThread, 0); + s_hThread = 0; + } +#endif + + for(size_t i = 0; i < s_Entries.size(); i++) + { + free(s_Entries[i]); + } + + s_Entries.clear(); + + + } + + +#ifndef __LINUX__ + + HANDLE OsSupport::s_hTimer = INVALID_HANDLE_VALUE; + HANDLE OsSupport::s_hThread = 0; + static HANDLE hTimer; + bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcode) { HANDLE hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pid); if (!hProcess) @@ -20,7 +75,7 @@ return false; } - bool ret = TerminateProcess(hProcess, 0); + bool ret = TerminateProcess(hProcess, exitcode); CloseHandle(hProcess); return ret; } @@ -88,9 +143,50 @@ return pid; } void OsSupport::delayExecution(long value) - { - Sleep(value * 1000); - } + { + Sleep(value * 1000); + } + + DWORD WINAPI AlarmThread(LPVOID param) + { + LARGE_INTEGER liDueTime; + + hTimer = CreateWaitableTimer(NULL, TRUE, _T("SysRegTimer")); + if (!hTimer) + { + return 0; + } + liDueTime.QuadPart = -100000000LL; + while(1) + { + SetWaitableTimer(hTimer, &liDueTime, 5000, NULL, NULL, FALSE); + WaitForSingleObject(hTimer, INFINITE); + OsSupport::checkAlarms (); + } + return 0; + } + + void OsSupport::setAlarm(long secs, OsSupport::ProcessID pid) + { + + PTIME_ENTRY entry = (PTIME_ENTRY) malloc(sizeof(TIME_ENTRY)); + if (entry) + { + cout << "secs: " << secs << endl; + struct timeval tm; + gettimeofday(&tm, 0); + tm.tv_sec += secs; + + entry->tm = tm; + entry->pid = pid; + s_Entries.push_back(entry); + if (s_Entries.size () == 1) + { + s_hThread = CreateThread(NULL, 0, AlarmThread, 0, 0, NULL); + } + } + } + #else /********************************************************************************************************************/ OsSupport::ProcessID OsSupport::createProcess(TCHAR *procname, int procargsnum, TCHAR **procargs, bool bWait) @@ -118,18 +214,59 @@ return pid; } - bool OsSupport::terminateProcess(OsSupport::ProcessID pid) + bool OsSupport::terminateProcess(OsSupport::ProcessID pid, int exitcode) { kill(pid, SIGKILL); return true; } - void OsSupport::delayExecution(long value) - { - sleep( value ); - } - - + void OsSupport::delayExecution(long value) + { + sleep( value ); + } + + void handleSignal(int sig) + { + if (sig == SIGALRM) + { + OsSupport::checkAlarms(); + } + } + void setAlarm(long secs, OsSupport::ProcessID pid) + { + sigemptyset( &sact.sa_mask ); + s_sact.sa_flags = 0; + s_sact.sa_handler = catcher; + sigaction( SIGALRM, &sact, NULL ); + + alarm(timeout); + + PTIME_ENTRY entry = (PTIME_ENTRY) malloc(sizeof(TIME_ENTRY)); + if (entry) + { + struct timeval tm; + gettimeofday(&tm, 0); + tm.tv_sec += secs; + + entry->tm = tm; + entry->pid = pid; + for(int i = 0; i < s_Entries.size(); i++) + { + if (tm.tv_sec < s_Entries[i]->tm.tv_sec && tm.tv_usec < s_Entries[i]->tm.tv_usec) + { + if (i == 0) + { + /* adjust alarm timer to new period */ + alarm(secs); + } + s_Entries.insert(s_Entries.begin() + i, entry); + return; + } + } + s_Entries.push_back(entry); + alarm(secs); + } + } #endif } // end of namespace System_ Modified: trunk/reactos/tools/sysreg/os_support.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/os_support.h?… ============================================================================== --- trunk/reactos/tools/sysreg/os_support.h (original) +++ trunk/reactos/tools/sysreg/os_support.h Tue Oct 2 20:09:29 2007 @@ -20,6 +20,11 @@ #endif #include "user_types.h" +#include <ctime> +#include <vector> +#include <sys/time.h> + +#define MAX(a, b) (((a) > (b)) ? (a) : (b)) namespace System_ { @@ -35,10 +40,8 @@ { public: #ifdef WIN32 - typedef DWORD ProcessID; #else - typedef pid_t ProcessID; #endif @@ -74,8 +77,9 @@ /// Note: returns true if the process with the given pid was terminated /// /// @param pid process id of the process to terminate +/// @param exitcode for the killed process - static bool terminateProcess(ProcessID pid); + static bool terminateProcess(ProcessID pid, int exitcode); //---------------------------------------------------------------------------------------- @@ -88,6 +92,32 @@ static void delayExecution(long sec); +///--------------------------------------------------------------------------------------- +/// +/// initializeTimer +/// +/// Description: this function initializes an alarm. When the alarm expires, it will terminate +/// the given process + + static void setAlarm(long sec, OsSupport::ProcessID pid); + +///--------------------------------------------------------------------------------------- +/// +/// cancelAlarms +/// +/// Description: this function cancels all available timers + + static void cancelAlarms(); + +///--------------------------------------------------------------------------------------- +/// +/// checkAlarms +/// +/// Description: this function checks for expired alarams + + static void checkAlarms(); + + protected: //--------------------------------------------------------------------------------------- /// @@ -98,6 +128,19 @@ OsSupport() {} +#ifdef __LINUX__ + static struct sigaction s_sact; +#else + static HANDLE s_hThread; +#endif + + typedef struct + { + struct timeval tm; + ProcessID pid; + }TIME_ENTRY, *PTIME_ENTRY; + typedef std::vector<PTIME_ENTRY> TimeEntryVector; + static TimeEntryVector s_Entries; }; // end of class OsSupport } // end of namespace System_ Modified: trunk/reactos/tools/sysreg/rosboot_test.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.cpp (original) +++ trunk/reactos/tools/sysreg/rosboot_test.cpp Tue Oct 2 20:09:29 2007 @@ -68,7 +68,7 @@ #endif //--------------------------------------------------------------------------------------- - RosBootTest::RosBootTest() : m_MaxTime(0.0), m_DelayRead(0) + RosBootTest::RosBootTest() : m_MaxTime(65), m_DelayRead(0) { } @@ -142,7 +142,6 @@ bool RosBootTest::isFileExisting(string output) { FILE * file; - file = _tfopen(output.c_str(), _T("r")); if (file) @@ -629,10 +628,21 @@ cerr << "Error: ROS_EMU_PATH is not set" << endl; return false; } - - conf_parser.getStringValue (RosBootTest::ROS_HDD_IMAGE, m_HDDImage); - conf_parser.getStringValue (RosBootTest::ROS_CD_IMAGE, m_CDImage); - conf_parser.getDoubleValue (RosBootTest::ROS_MAX_TIME, m_MaxTime); + if (!m_HDDImage.length()) + { + /* only read image once */ + conf_parser.getStringValue (RosBootTest::ROS_HDD_IMAGE, m_HDDImage); + } + if (!m_CDImage.length()) + { + /* only read cdimage once */ + conf_parser.getStringValue (RosBootTest::ROS_CD_IMAGE, m_CDImage); + } + /* reset boot cmd */ + m_BootCmd = _T(""); + + + conf_parser.getIntValue (RosBootTest::ROS_MAX_TIME, m_MaxTime); conf_parser.getStringValue (RosBootTest::ROS_LOG_FILE, m_DebugFile); conf_parser.getStringValue (RosBootTest::ROS_SYM_DIR, m_SymDir); conf_parser.getIntValue (RosBootTest::ROS_DELAY_READ, m_DelayRead); @@ -652,7 +662,7 @@ if (m_Pid) { - OsSupport::terminateProcess (m_Pid); + OsSupport::terminateProcess (m_Pid, 0); } delete m_DataSource; m_DataSource = NULL; @@ -741,6 +751,14 @@ m_Pid = atoi(buffer); fclose(file); #endif + OsSupport::cancelAlarms(); + OsSupport::setAlarm (m_MaxTime, m_Pid); +#ifdef __LINUX__ + OsSupport::setAlarm(m_MaxTime, _getpid()); +#else + OsSupport::setAlarm(m_MaxTime, GetCurrentProcessId()); +#endif + bool ret = analyzeDebugData(); cleanup(); @@ -912,36 +930,6 @@ return state; } //--------------------------------------------------------------------------------------- - bool RosBootTest::isTimeout(double max_timeout) - { - if (max_timeout == 0) - { - // no timeout specified - return false; - } - static time_t start = 0; - - if (!start) - { - time(&start); - return false; - } - - time_t stop; - time(&stop); - - double elapsed = difftime(stop, start); - if (elapsed > max_timeout) - { - return true; - } - else - { - return false; - } - - } -//--------------------------------------------------------------------------------------- bool RosBootTest::analyzeDebugData() { vector<string> vect; @@ -959,12 +947,7 @@ write_log = file.is_open (); while(1) { - if (isTimeout(m_MaxTime)) - { - break; - } size_t prev_count = vect.size (); - if (!m_DataSource->readSource (vect)) { continue; Modified: trunk/reactos/tools/sysreg/rosboot_test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/rosboot_test.… ============================================================================== --- trunk/reactos/tools/sysreg/rosboot_test.h (original) +++ trunk/reactos/tools/sysreg/rosboot_test.h Tue Oct 2 20:09:29 2007 @@ -14,8 +14,9 @@ #include "os_support.h" #include "user_types.h" #include <vector> +#ifdef __LINUX__ #include <unistd.h> - +#endif namespace Sysreg_ { @@ -132,22 +133,13 @@ DebugState checkDebugData(vector<string> & debug_data); -//--------------------------------------------------------------------------------------- -/// -/// checkTimeOut -/// -/// Description: this function checks if the ReactOS has run longer than the maximum available -/// time - - bool isTimeout(double max_timeout); - protected: string m_EmuType; string m_EmuPath; string m_HDDImage; string m_CDImage; - double m_MaxTime; + long int m_MaxTime; string m_DebugFile; string m_SymDir; long int m_DelayRead; Modified: trunk/reactos/tools/sysreg/sysreg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.cpp?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.cpp (original) +++ trunk/reactos/tools/sysreg/sysreg.cpp Tue Oct 2 20:09:29 2007 @@ -70,15 +70,16 @@ #if 0 SymbolFile::initialize (config, envvar); #endif - if (regtest->execute (config)) - { - cout << "The regression test completed successfully" << endl; - } - else - { - cout << "The regression test failed" << endl; - return -2; - } + for(int i = 0; i < 3; i++) + { + bool ret = regtest->execute(config); + if (!ret) + { + cout << "The regression test has failed at stage: " << i << endl; + return -2; + } + } + cout << "The regression test completed successfully" << endl; return 0; } Modified: trunk/reactos/tools/sysreg/txtmode.cfg URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/txtmode.cfg?r… ============================================================================== --- trunk/reactos/tools/sysreg/txtmode.cfg (original) +++ trunk/reactos/tools/sysreg/txtmode.cfg Tue Oct 2 20:09:29 2007 @@ -38,7 +38,7 @@ ; ; Set this variable to value which is the maximum time the emulator lets ReactOS run ; If not set, the emulator runs as long as no exception occurs in the emulator. -; ROS_MAX_TIME=180.0 +ROS_MAX_TIME=180 ; ROS_LOG_FILE ;

1 0

[janderwald] 29355: - draw drive dialog static controls - use rtl library for calculating [free|used] diskspace - add german resource strings
by janderwald＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: janderwald Date: Tue Oct 2 20:03:48 2007 New Revision: 29355 URL: http://svn.reactos.org/svn/reactos?rev=29355&view=rev Log: - draw drive dialog static controls - use rtl library for calculating [free|used] diskspace - add german resource strings Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_De.rc trunk/reactos/dll/win32/shell32/shresdef.h 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 (original) +++ trunk/reactos/dll/win32/shell32/drive.c Tue Oct 2 20:03:48 2007 @@ -21,6 +21,11 @@ #include "config.h" #include "wine/port.h" #define YDEBUG +#define LARGEINT_PROTOS +#define LargeIntegerDivide RtlLargeIntegerDivide +#define ExtendedIntegerMultiply RtlExtendedIntegerMultiply +#define ConvertUlongToLargeInteger RtlConvertUlongToLargeInteger +#define LargeIntegerSubtract RtlLargeIntegerSubtract #include <string.h> #include <stdarg.h> #include <stdio.h> @@ -43,6 +48,7 @@ #include <initguid.h> #include <devguid.h> #include <winioctl.h> +#include <largeint.h> WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -61,19 +67,90 @@ #define DRIVE_PROPERTY_PAGES (3) + +static +LARGE_INTEGER +GetFreeBytesShare(LARGE_INTEGER TotalNumberOfFreeBytes, LARGE_INTEGER TotalNumberOfBytes) +{ + LARGE_INTEGER Temp, Result, Remainder; + + Temp = LargeIntegerDivide(TotalNumberOfBytes, ConvertUlongToLargeInteger(100), &Remainder); + if (Temp.QuadPart >= TotalNumberOfFreeBytes.QuadPart) + { + Result = ConvertUlongToLargeInteger(1); + }else + { + Result = LargeIntegerDivide(TotalNumberOfFreeBytes, Temp, &Remainder); + } + + return Result; +} + +static +void +PaintStaticControls(HWND hwndDlg, LPDRAWITEMSTRUCT drawItem) +{ + HBRUSH hBrush; + + if (drawItem->CtlID == 14013) + { + hBrush = CreateSolidBrush(RGB(0, 0, 255)); + if (hBrush) + { + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); + DeleteObject((HGDIOBJ)hBrush); + } + }else if (drawItem->CtlID == 14014) + { + hBrush = CreateSolidBrush(RGB(255, 0, 255)); + if (hBrush) + { + FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); + DeleteObject((HGDIOBJ)hBrush); + } + } + else if (drawItem->CtlID == 14015) + { + HBRUSH hBlueBrush; + HBRUSH hMagBrush; + RECT rect; + LONG horzsize; + LARGE_INTEGER Result; + + hBlueBrush = CreateSolidBrush(RGB(0, 0, 255)); + hMagBrush = CreateSolidBrush(RGB(255, 0, 255)); + + Result.QuadPart = GetWindowLongPtr(hwndDlg, DWLP_USER); + + CopyRect(&rect, &drawItem->rcItem); + horzsize = rect.right - rect.left; + Result.QuadPart = (Result.QuadPart * horzsize) / 100; + + rect.right = rect.left + Result.QuadPart; + FillRect(drawItem->hDC, &rect, hMagBrush); + rect.left = rect.right; + rect.right = drawItem->rcItem.right; + FillRect(drawItem->hDC, &rect, hBlueBrush); + DeleteObject(hBlueBrush); + DeleteObject(hMagBrush); + } +} + static void InitializeGeneralDriveDialog(HWND hwndDlg, WCHAR * szDrive) { - WCHAR szVolumeName[MAX_PATH+1] = {0}; + WCHAR szVolumeName[MAX_PATH+1] = {0}; DWORD MaxComponentLength = 0; DWORD FileSystemFlags = 0; WCHAR FileSystemName[MAX_PATH+1] = {0}; + WCHAR szFormat[50]; + WCHAR szBuffer[128]; BOOL ret; UINT DriveType; ULARGE_INTEGER FreeBytesAvailable; - ULARGE_INTEGER TotalNumberOfBytes; - ULARGE_INTEGER TotalNumberOfFreeBytes; + LARGE_INTEGER TotalNumberOfFreeBytes; + LARGE_INTEGER TotalNumberOfBytes; ret = GetVolumeInformationW(szDrive, szVolumeName, MAX_PATH+1, NULL, &MaxComponentLength, &FileSystemFlags, FileSystemName, MAX_PATH+1); if (ret) @@ -89,24 +166,20 @@ DriveType = GetDriveTypeW(szDrive); if (DriveType == DRIVE_FIXED) { - if(GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes)) + + if(GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable, (PULARGE_INTEGER)&TotalNumberOfBytes, (PULARGE_INTEGER)&TotalNumberOfFreeBytes)) { WCHAR szResult[128]; + LARGE_INTEGER Result; +#ifdef IOCTL_DISK_GET_LENGTH_INFO_IMPLEMENTED HANDLE hVolume; DWORD BytesReturned = 0; - GET_LENGTH_INFORMATION LengthInformation; - if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart - FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14004, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); - - if (StrFormatByteSizeW(FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) - SendDlgItemMessageW(hwndDlg, 14006, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); -#if 0 + sprintfW(szResult, L"\\\\.\\%c:", towupper(szDrive[0])); hVolume = CreateFileW(szResult, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); if (hVolume != INVALID_HANDLE_VALUE) { - RtlZeroMemory(&LengthInformation, sizeof(GET_LENGTH_INFORMATION)); - ret = DeviceIoControl(hVolume, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, (LPVOID)&LengthInformation, sizeof(GET_LENGTH_INFORMATION), &BytesReturned, NULL); + 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))) SendDlgItemMessageW(hwndDlg, 14008, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); @@ -117,8 +190,32 @@ if (ret && StrFormatByteSizeW(TotalNumberOfBytes.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) SendDlgItemMessageW(hwndDlg, 14008, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); #endif + + if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart - FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14004, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + + if (StrFormatByteSizeW(FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14006, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + + Result = GetFreeBytesShare(TotalNumberOfFreeBytes, TotalNumberOfBytes); + /* set free bytes percentage */ + sprintfW(szResult, L"%02d%%", Result.QuadPart); + SendDlgItemMessageW(hwndDlg, 14007, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); + /* store free share amount */ + SetWindowLongPtr(hwndDlg, DWLP_USER, (LONG_PTR)Result.QuadPart); + /* store used share amount */ + Result = LargeIntegerSubtract(ConvertUlongToLargeInteger(100), Result); + sprintfW(szResult, L"%02d%%", Result.QuadPart); + SendDlgItemMessageW(hwndDlg, 14005, WM_SETTEXT, (WPARAM)0, (LPARAM)szResult); + if (LoadStringW(shell32_hInstance, IDS_DRIVE_FIXED, szBuffer, sizeof(szBuffer) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14002, WM_SETTEXT, (WPARAM)0, (LPARAM)szBuffer); + } } + /* set drive description */ + SendDlgItemMessageW(hwndDlg, 14010, WM_GETTEXT, (WPARAM)50, (LPARAM)szFormat); + sprintfW(szBuffer, szFormat, szDrive); + SendDlgItemMessageW(hwndDlg, 14010, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szBuffer); } @@ -132,6 +229,7 @@ ) { LPPROPSHEETPAGEW ppsp; + LPDRAWITEMSTRUCT drawItem; WCHAR * lpstr; switch(uMsg) @@ -144,7 +242,15 @@ lpstr = (WCHAR *)ppsp->lParam; InitializeGeneralDriveDialog(hwndDlg, lpstr); - return TRUE; + return TRUE; + case WM_DRAWITEM: + drawItem = (LPDRAWITEMSTRUCT)lParam; + if (drawItem->CtlID >= 14013 && drawItem->CtlID <= 14015) + { + PaintStaticControls(hwndDlg, drawItem); + return TRUE; + } + } Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Tue Oct 2 20:03:48 2007 @@ -22,6 +22,7 @@ <library>ole32</library> <library>version</library> <library>devmgr</library> + <library>rtl</library> <file>authors.c</file> <file>autocomplete.c</file> <file>brsfolder.c</file> Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Tue Oct 2 20:03:48 2007 @@ -224,15 +224,18 @@ //ICON EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP LTEXT "Typ:", -1, 15, 55, 40, 10 - LTEXT "", 14002, 40, 55, 100, 10 + LTEXT "", 14002, 110, 55, 100, 10 + LTEXT "Dateisystem:", -1, 15, 70, 100, 10 LTEXT "", 14003, 110, 70, 100, 10 + CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 LTEXT "Belegter Speicher:", -1, 25, 90, 120, 10 LTEXT "", 14004, 110, 90, 120, 10 LTEXT "", 14005, 200, 90, 40, 10 + CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 LTEXT "Freier Speicher:", -1, 25, 105, 70, 10 LTEXT "", 14006, 110, 105, 120, 10 LTEXT "", 14007, 200, 105, 40, 10 @@ -241,10 +244,12 @@ LTEXT "", 14008, 110, 125, 120, 10 LTEXT "", 14009, 200, 125, 40, 10 - LTEXT "", 14010, 150, 160, 40, 10 - PUSHBUTTON "Bereinigen", 14011, 190, 145, 50, 15, WS_DISABLED + CONTROL "", 14015, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 20, 140, 200, 20 + + LTEXT "Laufwerk %s", 14010, 100, 170, 40, 10 + PUSHBUTTON "Bereinigen", 14011, 180, 175, 50, 15, WS_DISABLED CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14012, 15, 205, 165, 10, WS_DISABLED - CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 15, 205, 165, 10, WS_DISABLED + CHECKBOX "Laufwerk für schnelle Dateisuche indizieren", 14012, 15, 220, 165, 10, WS_DISABLED } DRIVE_EXTRA_DLG DIALOGEX 0, 0, 240, 130 @@ -332,4 +337,7 @@ IDS_COMMON_PICTURES "Dokumente\\Eigene Bilder" IDS_COMMON_VIDEO "Dokumente\\Eigene Videos" IDS_CDBURN_AREA "Lokale Einstellungen\\Anwendungsdaten\\Microsoft\\CD Burning" -} + IDS_DRIVE_FIXED "Lokaler Datenträger" + IDS_DRIVE_CDROM "CD-Laufwerk" + IDS_DRIVE_NETWORK "Netzwerklaufwerk" +} Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h Tue Oct 2 20:03:48 2007 @@ -86,6 +86,9 @@ #define IDS_COMMON_PICTURES 69 #define IDS_COMMON_VIDEO 70 #define IDS_CDBURN_AREA 71 +#define IDS_DRIVE_FIXED 72 +#define IDS_DRIVE_CDROM 73 +#define IDS_DRIVE_NETWORK 74 /* browse for folder dialog box */ #define IDD_STATUS 0x3743

1 0

[hpoussin] 29354: Simplify code. Spotted by Pablo Menichini, pablo at menichini dot com dot ar
by hpoussin＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: hpoussin Date: Tue Oct 2 18:38:14 2007 New Revision: 29354 URL: http://svn.reactos.org/svn/reactos?rev=29354&view=rev Log: Simplify code. Spotted by Pablo Menichini, pablo at menichini dot com dot ar Modified: trunk/reactos/base/setup/usetup/drivesup.c Modified: trunk/reactos/base/setup/usetup/drivesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/drivesup… ============================================================================== --- trunk/reactos/base/setup/usetup/drivesup.c (original) +++ trunk/reactos/base/setup/usetup/drivesup.c Tue Oct 2 18:38:14 2007 @@ -79,12 +79,13 @@ /* strip trailing directory */ Ptr = wcsrchr(SourceName.Buffer, L'\\'); if (Ptr) + { RtlCreateUnicodeString(SourceRootDir, Ptr); + *Ptr = 0; + } else RtlCreateUnicodeString(SourceRootDir, L""); - if (Ptr != NULL) - *Ptr = 0; RtlCreateUnicodeString(SourceRootPath, SourceName.Buffer); }

1 0

[hpoussin] 29353: Support "i386" as an alternative name for cdrom directory
by hpoussin＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: hpoussin Date: Tue Oct 2 16:23:40 2007 New Revision: 29353 URL: http://svn.reactos.org/svn/reactos?rev=29353&view=rev Log: Support "i386" as an alternative name for cdrom directory Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Tue Oct 2 16:23:40 2007 @@ -167,9 +167,20 @@ VOID RunLoader(VOID) { ULONG_PTR Base; - ULONG Size; + ULONG Size, i; const char *SourcePath; const char *LoadOptions = "", *DbgLoadOptions = ""; + const char *sourcePaths[] = { + "", /* Only for floppy boot */ +#if defined(_M_IX86) + "\\I386", +#elif defined(_M_MPPC) + "\\PPC", +#elif defined(_M_MRX000) + "\\MIPS", +#endif + "\\reactos", + NULL }; char szKernelName[256]; HINF InfHandle; @@ -246,13 +257,21 @@ } /* Open 'txtsetup.sif' */ - if (!InfOpenFile (&InfHandle, - MachDiskBootingFromFloppy() ? "\\txtsetup.sif" : "\\reactos\\txtsetup.sif", - &ErrorLine)) + for (i = MachDiskBootingFromFloppy() ? 0 : 1; ; i++) + { + SourcePath = sourcePaths[i]; + if (!SourcePath) { printf("Failed to open 'txtsetup.sif'\n"); return; } + strcpy(szKernelName, SourcePath); + strcat(szKernelName, "\\txtsetup.sif"); + if (InfOpenFile (&InfHandle, szKernelName, &ErrorLine)) + break; + } + if (!*SourcePath) + SourcePath = "\\"; #ifdef DBG /* Get load options */ @@ -284,17 +303,6 @@ #if 0 printf("LoadOptions: '%s'\n", LoadOptions); #endif - - if (MachDiskBootingFromFloppy()) - { - /* Boot from floppy disk */ - SourcePath = "\\"; - } - else - { - /* Boot from cdrom */ - SourcePath = "\\reactos"; - } /* Set kernel command line */ MachDiskGetBootPath(reactos_kernel_cmdline, sizeof(reactos_kernel_cmdline));

1 0

[hpoussin] 29352: Do not hardcode cdrom directory
by hpoussin＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: hpoussin Date: Tue Oct 2 16:16:45 2007 New Revision: 29352 URL: http://svn.reactos.org/svn/reactos?rev=29352&view=rev Log: Do not hardcode cdrom directory Modified: trunk/reactos/base/setup/usetup/drivesup.c trunk/reactos/base/setup/usetup/drivesup.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/usetup.h Modified: trunk/reactos/base/setup/usetup/drivesup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/drivesup… ============================================================================== --- trunk/reactos/base/setup/usetup/drivesup.c (original) +++ trunk/reactos/base/setup/usetup/drivesup.c Tue Oct 2 16:16:45 2007 @@ -35,7 +35,8 @@ NTSTATUS GetSourcePaths(PUNICODE_STRING SourcePath, - PUNICODE_STRING SourceRootPath) + PUNICODE_STRING SourceRootPath, + PUNICODE_STRING SourceRootDir) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING LinkName; @@ -73,17 +74,19 @@ if (NT_SUCCESS(Status)) { RtlCreateUnicodeString(SourcePath, - SourceName.Buffer); + SourceName.Buffer); /* strip trailing directory */ Ptr = wcsrchr(SourceName.Buffer, L'\\'); -// if ((Ptr != NULL) && -// (wcsicmp(Ptr, L"\\reactos") == 0)) + if (Ptr) + RtlCreateUnicodeString(SourceRootDir, Ptr); + else + RtlCreateUnicodeString(SourceRootDir, L""); + if (Ptr != NULL) - *Ptr = 0; - + *Ptr = 0; RtlCreateUnicodeString(SourceRootPath, - SourceName.Buffer); + SourceName.Buffer); } NtClose(Handle); Modified: trunk/reactos/base/setup/usetup/drivesup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/drivesup… ============================================================================== --- trunk/reactos/base/setup/usetup/drivesup.h (original) +++ trunk/reactos/base/setup/usetup/drivesup.h Tue Oct 2 16:16:45 2007 @@ -29,7 +29,8 @@ NTSTATUS GetSourcePaths(PUNICODE_STRING SourcePath, - PUNICODE_STRING SourceRootPath); + PUNICODE_STRING SourceRootPath, + PUNICODE_STRING SourceRootDir); #endif /* __DRIVESUP_H__ */ Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Tue Oct 2 16:16:45 2007 @@ -74,6 +74,7 @@ HANDLE ProcessHeap; UNICODE_STRING SourceRootPath; +UNICODE_STRING SourceRootDir; UNICODE_STRING SourcePath; BOOLEAN IsUnattendedSetup = FALSE; LONG UnattendDestinationDiskNumber; @@ -635,7 +636,8 @@ /* Get the source path and source root path */ Status = GetSourcePaths(&SourcePath, - &SourceRootPath); + &SourceRootPath, + &SourceRootDir); if (!NT_SUCCESS(Status)) { CONSOLE_PrintTextXY(6, 15, "GetSourcePaths() failed (Status 0x%08lx)", Status); @@ -649,6 +651,7 @@ { CONSOLE_PrintTextXY(6, 15, "SourcePath: '%wZ'", &SourcePath); CONSOLE_PrintTextXY(6, 16, "SourceRootPath: '%wZ'", &SourceRootPath); + CONSOLE_PrintTextXY(6, 17, "SourceRootDir: '%wZ'", &SourceRootDir); } #endif @@ -2692,7 +2695,7 @@ if (!SetupQueueCopy(SetupFileQueue, SourceCabinet, SourceRootPath.Buffer, - L"\\reactos", + SourceRootDir.Buffer, FileKeyName, DirKeyValue, TargetFileName)) @@ -3562,6 +3565,7 @@ /* Initialize global unicode strings */ RtlInitUnicodeString(&SourcePath, NULL); RtlInitUnicodeString(&SourceRootPath, NULL); + RtlInitUnicodeString(&SourceRootDir, NULL); RtlInitUnicodeString(&InstallPath, NULL); RtlInitUnicodeString(&DestinationPath, NULL); RtlInitUnicodeString(&DestinationArcPath, NULL); Modified: trunk/reactos/base/setup/usetup/usetup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.h… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.h (original) +++ trunk/reactos/base/setup/usetup/usetup.h Tue Oct 2 16:16:45 2007 @@ -74,6 +74,7 @@ extern HANDLE ProcessHeap; extern UNICODE_STRING SourceRootPath; +extern UNICODE_STRING SourceRootDir; extern UNICODE_STRING SourcePath; extern BOOLEAN IsUnattendedSetup;

1 0

[hpoussin] 29351: Add a default debug channel
by hpoussin＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: hpoussin Date: Tue Oct 2 14:57:00 2007 New Revision: 29351 URL: http://svn.reactos.org/svn/reactos?rev=29351&view=rev Log: Add a default debug channel Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/fprop.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 (original) +++ trunk/reactos/dll/win32/shell32/drive.c Tue Oct 2 14:57:00 2007 @@ -44,6 +44,8 @@ #include <devguid.h> #include <winioctl.h> +WINE_DEFAULT_DEBUG_CHANNEL(shell); + typedef enum { HWPD_STANDARDLIST = 0, Modified: trunk/reactos/dll/win32/shell32/fprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/fprop.c?… ============================================================================== --- trunk/reactos/dll/win32/shell32/fprop.c (original) +++ trunk/reactos/dll/win32/shell32/fprop.c Tue Oct 2 14:57:00 2007 @@ -40,6 +40,8 @@ #include "shresdef.h" #include "undocshell.h" #include <prsht.h> + +WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct _LANGANDCODEPAGE_ {

1 0

[jimtabor] 29350: Fix NtUserGetIconSize prototype.
by jimtabor＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: jimtabor Date: Tue Oct 2 04:56:04 2007 New Revision: 29350 URL: http://svn.reactos.org/svn/reactos?rev=29350&view=rev Log: Fix NtUserGetIconSize prototype. Modified: trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Tue Oct 2 04:56:04 2007 @@ -1081,13 +1081,13 @@ DWORD dwUnknown5, DWORD dwUnknown6); -DWORD +BOOL NTAPI NtUserGetIconSize( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4); + HANDLE Handle, + DWORD Unknown, + LONG *plcx, + LONG *plcy); DWORD NTAPI Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Tue Oct 2 04:56:04 2007 @@ -777,16 +777,16 @@ /* for hints how the prototype might be, see http://forum.grafika.cz/read.php?23,1816012,1816139,quote=1 http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634c… */ -DWORD +BOOL NTAPI NtUserGetIconSize( - DWORD dwUnknown1, - DWORD dwUnknown2, - DWORD dwUnknown3, - DWORD dwUnknown4) -{ - UNIMPLEMENTED; - return 0; + HANDLE Handle, + DWORD dwUnknown2, // Most of the time Zero. + PLONG plcx, // &size.cx + PLONG plcy) // &size.cy +{ + UNIMPLEMENTED; + return FALSE; } DWORD

1 0

[janderwald] 29349: - improve drive property dialog a bit
by janderwald＠svn.reactos.org 02 Oct '07

02 Oct '07

Author: janderwald Date: Tue Oct 2 04:07:22 2007 New Revision: 29349 URL: http://svn.reactos.org/svn/reactos?rev=29349&view=rev Log: - improve drive property dialog a bit Modified: trunk/reactos/dll/win32/shell32/drive.c trunk/reactos/dll/win32/shell32/shell32.rbuild trunk/reactos/dll/win32/shell32/shell32_De.rc 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 (original) +++ trunk/reactos/dll/win32/shell32/drive.c Tue Oct 2 04:07:22 2007 @@ -20,7 +20,7 @@ #include "config.h" #include "wine/port.h" - +#define YDEBUG #include <string.h> #include <stdarg.h> #include <stdio.h> @@ -40,8 +40,85 @@ #include "shresdef.h" #include "undocshell.h" #include <prsht.h> +#include <initguid.h> +#include <devguid.h> +#include <winioctl.h> + +typedef enum +{ + HWPD_STANDARDLIST = 0, + HWPD_LARGELIST, + HWPD_MAX = HWPD_LARGELIST +} HWPAGE_DISPLAYMODE, *PHWPAGE_DISPLAYMODE; + +HWND WINAPI +DeviceCreateHardwarePageEx(HWND hWndParent, + LPGUID lpGuids, + UINT uNumberOfGuids, + HWPAGE_DISPLAYMODE DisplayMode); #define DRIVE_PROPERTY_PAGES (3) + +static +void +InitializeGeneralDriveDialog(HWND hwndDlg, WCHAR * szDrive) +{ + WCHAR szVolumeName[MAX_PATH+1] = {0}; + DWORD MaxComponentLength = 0; + DWORD FileSystemFlags = 0; + WCHAR FileSystemName[MAX_PATH+1] = {0}; + BOOL ret; + UINT DriveType; + ULARGE_INTEGER FreeBytesAvailable; + ULARGE_INTEGER TotalNumberOfBytes; + ULARGE_INTEGER TotalNumberOfFreeBytes; + + ret = GetVolumeInformationW(szDrive, szVolumeName, MAX_PATH+1, NULL, &MaxComponentLength, &FileSystemFlags, FileSystemName, MAX_PATH+1); + if (ret) + { + /* set volume label */ + SendDlgItemMessageW(hwndDlg, 14001, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szVolumeName); + + /* set filesystem type */ + SendDlgItemMessageW(hwndDlg, 14003, WM_SETTEXT, (WPARAM)NULL, (LPARAM)FileSystemName); + + } + + DriveType = GetDriveTypeW(szDrive); + if (DriveType == DRIVE_FIXED) + { + if(GetDiskFreeSpaceExW(szDrive, &FreeBytesAvailable, &TotalNumberOfBytes, &TotalNumberOfFreeBytes)) + { + WCHAR szResult[128]; + HANDLE hVolume; + DWORD BytesReturned = 0; + GET_LENGTH_INFORMATION LengthInformation; + if (StrFormatByteSizeW(TotalNumberOfBytes.QuadPart - FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14004, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); + + if (StrFormatByteSizeW(FreeBytesAvailable.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14006, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); +#if 0 + sprintfW(szResult, L"\\\\.\\%c:", towupper(szDrive[0])); + hVolume = CreateFileW(szResult, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + if (hVolume != INVALID_HANDLE_VALUE) + { + RtlZeroMemory(&LengthInformation, sizeof(GET_LENGTH_INFORMATION)); + ret = DeviceIoControl(hVolume, IOCTL_DISK_GET_LENGTH_INFO, NULL, 0, (LPVOID)&LengthInformation, sizeof(GET_LENGTH_INFORMATION), &BytesReturned, NULL); + if (ret && StrFormatByteSizeW(LengthInformation.Length.QuadPart, szResult, sizeof(szResult) / sizeof(WCHAR))) + SendDlgItemMessageW(hwndDlg, 14008, 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, 14008, WM_SETTEXT, (WPARAM)NULL, (LPARAM)szResult); +#endif + } + } +} + INT_PTR CALLBACK @@ -52,7 +129,21 @@ LPARAM lParam ) { - + LPPROPSHEETPAGEW ppsp; + + WCHAR * lpstr; + switch(uMsg) + { + case WM_INITDIALOG: + ppsp = (LPPROPSHEETPAGEW)lParam; + if (ppsp == NULL) + break; + TRACE("WM_INITDIALOG hwnd %p lParam %p ppsplParam %S\n",hwndDlg, lParam, ppsp->lParam); + + lpstr = (WCHAR *)ppsp->lParam; + InitializeGeneralDriveDialog(hwndDlg, lpstr); + return TRUE; + } return FALSE; @@ -80,9 +171,24 @@ LPARAM lParam ) { - - - return FALSE; + GUID Guids[1]; + Guids[0] = GUID_DEVCLASS_DISKDRIVE; + + UNREFERENCED_PARAMETER(lParam); + UNREFERENCED_PARAMETER(wParam); + + switch(uMsg) + { + case WM_INITDIALOG: + /* create the hardware page */ + DeviceCreateHardwarePageEx(hwndDlg, + Guids, + sizeof(Guids) / sizeof(Guids[0]), + 0); + break; + } + + return FALSE; } static Modified: trunk/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32.rbuild (original) +++ trunk/reactos/dll/win32/shell32/shell32.rbuild Tue Oct 2 04:07:22 2007 @@ -21,6 +21,7 @@ <library>shlwapi</library> <library>ole32</library> <library>version</library> + <library>devmgr</library> <file>authors.c</file> <file>autocomplete.c</file> <file>brsfolder.c</file> Modified: trunk/reactos/dll/win32/shell32/shell32_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shell32_… ============================================================================== --- trunk/reactos/dll/win32/shell32/shell32_De.rc (original) +++ trunk/reactos/dll/win32/shell32/shell32_De.rc Tue Oct 2 04:07:22 2007 @@ -225,18 +225,22 @@ EDITTEXT 14001, 40, 20, 190, 10, ES_LEFT|WS_BORDER|WS_GROUP LTEXT "Typ:", -1, 15, 55, 40, 10 LTEXT "", 14002, 40, 55, 100, 10 - LTEXT "Dateisystem:",-1, 15, 70, 100, 10 - LTEXT "", 14003, 40, 70, 100, 10 + + LTEXT "Dateisystem:", -1, 15, 70, 100, 10 + LTEXT "", 14003, 110, 70, 100, 10 LTEXT "Belegter Speicher:", -1, 25, 90, 120, 10 LTEXT "", 14004, 110, 90, 120, 10 LTEXT "", 14005, 200, 90, 40, 10 + LTEXT "Freier Speicher:", -1, 25, 105, 70, 10 LTEXT "", 14006, 110, 105, 120, 10 LTEXT "", 14007, 200, 105, 40, 10 + LTEXT "Speicherkapazität:", -1, 25, 125, 80, 10 LTEXT "", 14008, 110, 125, 120, 10 LTEXT "", 14009, 200, 125, 40, 10 + LTEXT "", 14010, 150, 160, 40, 10 PUSHBUTTON "Bereinigen", 14011, 190, 145, 50, 15, WS_DISABLED CHECKBOX "Laufwerk komprimieren, um Speicherplatz zu sparen", 14012, 15, 205, 165, 10, WS_DISABLED

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2007