Ros-diffs January 2017

ros-diffs@reactos.org

15 participants
160 discussions

[hbelusca] 73623: [CMD]: The 'type' command can open & display files opened with write access.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 29 17:45:34 2017 New Revision: 73623 URL: http://svn.reactos.org/svn/reactos?rev=73623&view=rev Log: [CMD]: The 'type' command can open & display files opened with write access. Modified: trunk/reactos/base/shell/cmd/type.c Modified: trunk/reactos/base/shell/cmd/type.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/type.c?rev=… ============================================================================== --- trunk/reactos/base/shell/cmd/type.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/type.c [iso-8859-1] Sun Jan 29 17:45:34 2017 @@ -82,7 +82,7 @@ hFile = CreateFile(argv[i], GENERIC_READ, - FILE_SHARE_READ, NULL, + FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);

7 years, 10 months

[hbelusca] 73622: [TREE]: Rework the utility (use explicit UNICODE, use WIN32 types, remove useless dependency to user32...), and add support for console ConUtils streams. CORE-12677 #resolve

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 29 16:51:23 2017 New Revision: 73622 URL: http://svn.reactos.org/svn/reactos?rev=73622&view=rev Log: [TREE]: Rework the utility (use explicit UNICODE, use WIN32 types, remove useless dependency to user32...), and add support for console ConUtils streams. CORE-12677 #resolve Modified: trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt trunk/reactos/base/applications/cmdutils/tree/tree.c Modified: trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt [iso-8859-1] Sun Jan 29 16:51:23 2017 @@ -1,6 +1,9 @@ + +include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils) add_executable(tree tree.c tree.rc) set_module_type(tree win32cui UNICODE) +target_link_libraries(tree conutils ${PSEH_LIB}) +add_importlibs(tree msvcrt kernel32) set_target_properties(tree PROPERTIES SUFFIX ".com") -add_importlibs(tree user32 msvcrt kernel32) add_cd_file(TARGET tree DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/tree/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] Sun Jan 29 16:51:23 2017 @@ -1,44 +1,29 @@ -ï»¿/* +/* * PROJECT: ReactOS * LICENSE: GNU GPLv2 only as published by the Free Software Foundation - * PURPOSE: Implements tree.com functionality similar to Windows + * PURPOSE: Implements tree.com command similar to Windows * PROGRAMMERS: Asif Bahrainwala (asif_bahrainwala(a)hotmail.com) */ #include <stdio.h> #include <stdlib.h> + #include <windef.h> #include <winbase.h> -#include <winuser.h> + +#include <conutils.h> #include "resource.h" #define STR_MAX 2048 -static void GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine); - -/* if this flag is set to true, files will also be listed */ +static VOID GetDirectoryStructure(PWSTR strPath, UINT width, PCWSTR prevLine); + +/* If this flag is set to true, files will also be listed within the folder structure */ BOOL bShowFiles = FALSE; -/* if this flag is true, ASCII characters will be used instead of UNICODE ones */ +/* If this flag is true, ASCII characters will be used instead of UNICODE ones */ BOOL bUseAscii = FALSE; - -/* - * This takes strings from a resource string table - * and outputs it to the console. - */ -VOID PrintResourceString(INT resID, ...) -{ - WCHAR tmpBuffer[STR_MAX]; - CHAR tmpBufferA[STR_MAX]; - va_list arg_ptr; - - va_start(arg_ptr, resID); - LoadStringW(GetModuleHandle(NULL), resID, tmpBuffer, STR_MAX); - CharToOemW(tmpBuffer, tmpBufferA); - vfprintf(stdout, tmpBufferA, arg_ptr); - va_end(arg_ptr); -} /** * @name: HasSubFolder @@ -47,20 +32,20 @@ * Must specify folder name * * @return -* true if folder has sub folders, else will return false +* true if folder has sub-folders, else will return false */ -static BOOL HasSubFolder(const wchar_t *strPath1) +static BOOL HasSubFolder(PCWSTR strPath1) { BOOL ret = FALSE; - WIN32_FIND_DATA FindFileData; + WIN32_FIND_DATAW FindFileData; HANDLE hFind = NULL; - static wchar_t strPath[STR_MAX] = L""; + static WCHAR strPath[STR_MAX] = L""; ZeroMemory(strPath, sizeof(strPath)); wcscat(strPath, strPath1); wcscat(strPath, L"\\*."); - hFind = FindFirstFile(strPath, &FindFileData); + hFind = FindFirstFileW(strPath, &FindFileData); do { if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) @@ -71,11 +56,11 @@ continue; } - ret = TRUE; //found subfolder + ret = TRUE; // Sub-folder found break; } } - while (FindNextFile(hFind, &FindFileData)); + while (FindNextFileW(hFind, &FindFileData)); FindClose(hFind); return ret; @@ -100,22 +85,22 @@ * @return * void */ -static void DrawTree(const wchar_t* strPath, - const WIN32_FIND_DATA *arrFolder, +static VOID DrawTree(PCWSTR strPath, + const WIN32_FIND_DATAW* arrFolder, const size_t szArr, UINT width, - const wchar_t *prevLine, + PCWSTR prevLine, BOOL drawfolder) { BOOL bHasSubFolder = HasSubFolder(strPath); UINT i = 0; - /* this will format the spaces required for correct formatting */ + /* This will format the spaces required for correct formatting */ for (i = 0; i < szArr; ++i) { - wchar_t *consoleOut = (wchar_t*)malloc(sizeof(wchar_t) * STR_MAX); + PWSTR consoleOut = (PWSTR)malloc(STR_MAX * sizeof(WCHAR)); UINT j = 0; - static wchar_t str[STR_MAX]; + static WCHAR str[STR_MAX]; /* As we do not seem to have the _s functions properly set up, use the non-secure version for now */ //wcscpy_s(consoleOut, STR_MAX, L""); @@ -125,15 +110,14 @@ for (j = 0; j < width - 1; ++j) { - /* if the previous line has 'â' or 'â' then the current line will + /* If the previous line has 'â' or 'â' then the current line will add 'â' to continue the connecting line */ - if ((BYTE)prevLine[j] == 195 || (BYTE)prevLine[j] == 179 || - (BYTE)prevLine[j] == L'+' || (BYTE)prevLine[j] == L'|') + if (prevLine[j] == L'\x251C' || prevLine[j] == L'\x2502' || + prevLine[j] == L'+' || prevLine[j] == L'|') { if (!bUseAscii) { - wchar_t a[] = {179, 0}; - wcscat(consoleOut, a); + wcscat(consoleOut, L"\x2502"); } else { @@ -150,27 +134,27 @@ { if (drawfolder) { - /* will add 'ââââFolder name */ + /* Add 'ââââFolder name' (\xC3\xC4\xC4\xC4 or \x251C\x2500\x2500\x2500) */ if (bUseAscii) - wsprintf(str, L"+---%s", (wchar_t*)arrFolder[i].cFileName); - else - wsprintf(str, L"%c%c%c%c%s", 195, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName); + swprintf(str, L"+---%s", arrFolder[i].cFileName); + else + swprintf(str, L"\x251C\x2500\x2500\x2500%s", arrFolder[i].cFileName); } else { if (bHasSubFolder) { - /* will add 'â FileNamw' //thie line is added to connect - the belowfolder sub structure */ + /* Add 'â FileName' (\xB3 or \x2502) */ + // This line is added to connect the below-folder sub-structure if (bUseAscii) - wsprintf(str,L"| %s", (wchar_t*)arrFolder[i].cFileName); + swprintf(str, L"| %s", arrFolder[i].cFileName); else - wsprintf(str,L"%c %s", 179, (wchar_t*)arrFolder[i].cFileName); - } - else - { - /* will add ' FileNamw' */ - wsprintf(str,L" %s", (wchar_t*)arrFolder[i].cFileName); + swprintf(str, L"\x2502 %s", arrFolder[i].cFileName); + } + else + { + /* Add ' FileName' */ + swprintf(str, L" %s", arrFolder[i].cFileName); } } } @@ -178,44 +162,44 @@ { if (drawfolder) { - /* 'ââââFolder name' */ + /* 'ââââFolder name' (\xC0\xC4\xC4\xC4 or \x2514\x2500\x2500\x2500) */ if (bUseAscii) - wsprintf(str, L"\\---%s", (wchar_t*)arrFolder[i].cFileName); - else - wsprintf(str, L"%c%c%c%c%s", 192, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName); + swprintf(str, L"\\---%s", arrFolder[i].cFileName); + else + swprintf(str, L"\x2514\x2500\x2500\x2500%s", arrFolder[i].cFileName); } else { if (bHasSubFolder) { - /* 'â FileName' */ + /* 'â FileName' (\xB3 or \x2502) */ if (bUseAscii) - wsprintf(str, L"| %s", (wchar_t*)arrFolder[i].cFileName); + swprintf(str, L"| %s", arrFolder[i].cFileName); else - wsprintf(str, L"%c %s", 179, (wchar_t*)arrFolder[i].cFileName); + swprintf(str, L"\x2502 %s", arrFolder[i].cFileName); } else { /* ' FileName' */ - wsprintf(str, L" %s", (wchar_t*)arrFolder[i].cFileName); + swprintf(str, L" %s", arrFolder[i].cFileName); } } } wcscat(consoleOut, str); - wprintf(L"%s\n", consoleOut); + ConPrintf(StdOut, L"%s\n", consoleOut); if (drawfolder) { - wchar_t *str = (wchar_t*)malloc(STR_MAX * sizeof(wchar_t)); - ZeroMemory(str, STR_MAX * sizeof(wchar_t)); - - wcscat(str, strPath); - wcscat(str, L"\\"); - wcscat(str, arrFolder[i].cFileName); - GetDirectoryStructure(str, width + 4, consoleOut); - - free(str); + PWSTR str = (PWSTR)malloc(STR_MAX * sizeof(WCHAR)); + ZeroMemory(str, STR_MAX * sizeof(WCHAR)); + + wcscat(str, strPath); + wcscat(str, L"\\"); + wcscat(str, arrFolder[i].cFileName); + GetDirectoryStructure(str, width + 4, consoleOut); + + free(str); } free(consoleOut); } @@ -235,27 +219,27 @@ * @return * void */ -static void -GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine) +static VOID +GetDirectoryStructure(PWSTR strPath, UINT width, PCWSTR prevLine) { - WIN32_FIND_DATA FindFileData; + WIN32_FIND_DATAW FindFileData; HANDLE hFind = NULL; //DWORD err = 0; - /* will fill up with names of all sub folders */ - WIN32_FIND_DATA *arrFolder = NULL; + /* Fill up with names of all sub-folders */ + WIN32_FIND_DATAW *arrFolder = NULL; UINT arrFoldersz = 0; - /* will fill up with names of all sub folders */ - WIN32_FIND_DATA *arrFile = NULL; + /* Fill up with names of all sub-folders */ + WIN32_FIND_DATAW *arrFile = NULL; UINT arrFilesz = 0; ZeroMemory(&FindFileData, sizeof(FindFileData)); { - static wchar_t tmp[STR_MAX] = L""; + static WCHAR tmp[STR_MAX] = L""; ZeroMemory(tmp, sizeof(tmp)); wcscat(tmp, strPath); wcscat(tmp, L"\\*.*"); - hFind = FindFirstFile(tmp, &FindFileData); + hFind = FindFirstFileW(tmp, &FindFileData); //err = GetLastError(); } @@ -271,7 +255,7 @@ continue; ++arrFoldersz; - arrFolder = (WIN32_FIND_DATA*)realloc(arrFolder, arrFoldersz * sizeof(FindFileData)); + arrFolder = (WIN32_FIND_DATAW*)realloc(arrFolder, arrFoldersz * sizeof(FindFileData)); if (arrFolder == NULL) exit(-1); @@ -282,7 +266,7 @@ else { ++arrFilesz; - arrFile = (WIN32_FIND_DATA*)realloc(arrFile, arrFilesz * sizeof(FindFileData)); + arrFile = (WIN32_FIND_DATAW*)realloc(arrFile, arrFilesz * sizeof(FindFileData)); if(arrFile == NULL) exit(-1); @@ -290,17 +274,17 @@ arrFile[arrFilesz - 1] = FindFileData; } } - while (FindNextFile(hFind, &FindFileData)); + while (FindNextFileW(hFind, &FindFileData)); FindClose(hFind); if (bShowFiles) { - /* will free(arrFile) */ + /* Will free(arrFile) */ DrawTree(strPath, arrFile, arrFilesz, width, prevLine, FALSE); } - /* will free(arrFile) */ + /* Will free(arrFile) */ DrawTree(strPath, arrFolder, arrFoldersz, width, prevLine, TRUE); free(arrFolder); @@ -314,18 +298,21 @@ * @return * error /success value */ -int wmain( int argc, wchar_t *argv[]) +int wmain(int argc, WCHAR* argv[]) { DWORD dwSerial = 0; - wchar_t t = 0; - wchar_t *strPath = NULL; + WCHAR t = 0; + PWSTR strPath = NULL; DWORD sz = 0; - //wchar_t *context = NULL; - wchar_t *driveLetter = NULL; + //PWSTR context = NULL; + PWSTR driveLetter = NULL; int i; - /* parse the command line */ + /* Initialize the Console Standard Streams */ + ConInitStdStreams(); + + /* Parse the command line */ for (i = 1; i < argc; ++i) { if (argv[i][0] == L'-' || argv[i][0] == L'/') @@ -333,49 +320,51 @@ switch (towlower(argv[i][1])) { case L'?': - /* will print help and exit after */ - PrintResourceString(IDS_USAGE); + /* Print help and exit after */ + ConResPuts(StdOut, IDS_USAGE); return 0; + case L'f': - /* if set to true, will populate all the files within the folder structure */ bShowFiles = TRUE; break; + case L'a': bUseAscii = TRUE; break; + default: break; } } else { - /* this must be path to some folder */ - - /* will set the current directory for this executable */ + /* This must be path to some folder */ + + /* Set the current directory for this executable */ BOOL b = SetCurrentDirectoryW(argv[i]); if (b == FALSE) { - PrintResourceString(IDS_NO_SUBDIRECTORIES); + ConResPuts(StdOut, IDS_NO_SUBDIRECTORIES); return 1; } } } - PrintResourceString(IDS_FOLDER_PATH); - - GetVolumeInformation(NULL, NULL, 0, &dwSerial, NULL, NULL, NULL, 0); - PrintResourceString(IDS_VOL_SERIAL, dwSerial >> 16, dwSerial & 0xffff); + ConResPuts(StdOut, IDS_FOLDER_PATH); + + GetVolumeInformationW(NULL, NULL, 0, &dwSerial, NULL, NULL, NULL, 0); + ConResPrintf(StdOut, IDS_VOL_SERIAL, dwSerial >> 16, dwSerial & 0xffff); /* get the buffer size */ - sz = GetCurrentDirectory(1, &t); + sz = GetCurrentDirectoryW(1, &t); /* must not return before calling delete[] */ - strPath = (wchar_t*)malloc(sizeof(wchar_t) * sz); + strPath = (PWSTR)malloc(sz * sizeof(WCHAR)); /* get the current directory */ - GetCurrentDirectory(sz, strPath); + GetCurrentDirectoryW(sz, strPath); /* get the drive letter , must not return before calling delete[] */ - driveLetter = (wchar_t*)malloc(sizeof(wchar_t) * sz); + driveLetter = (PWSTR)malloc(sz * sizeof(WCHAR)); /* As we do not seem to have the _s functions properly set up, use the non-secure version for now */ //wcscpy_s(driveLetter,sz,strPath); @@ -383,15 +372,15 @@ wcscpy(driveLetter, strPath); wcstok(driveLetter, L":"); - wprintf(L"%s:.\n", driveLetter); + ConPrintf(StdOut, L"%s:.\n", driveLetter); free(driveLetter); - /* get the sub directories within this current folder */ + /* get the sub-directories within this current folder */ GetDirectoryStructure(strPath, 1, L" "); free(strPath); - wprintf(L"\n"); + ConPuts(StdOut, L"\n"); return 0; }

7 years, 10 months

[hbelusca] 73621: [FREELDR] - Simplify the implementation of the 'DiskGetBootPath' function; - Cache the retrived freeldr boot path (corresponding to a given 'FrldrBootDrive' number); - Introduce a...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 29 15:43:12 2017 New Revision: 73621 URL: http://svn.reactos.org/svn/reactos?rev=73621&view=rev Log: [FREELDR] - Simplify the implementation of the 'DiskGetBootPath' function; - Cache the retrived freeldr boot path (corresponding to a given 'FrldrBootDrive' number); - Introduce a 'DiskIsCdRomDrive' function to attempt to fix CORE-12692 . Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/include/disk.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Sun Jan 29 15:43:12 2017 @@ -17,6 +17,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +// #if defined(__i386__) || defined(_M_AMD64) + #include <freeldr.h> #define NDEBUG @@ -25,6 +27,7 @@ DBG_DEFAULT_CHANNEL(DISK); #include <pshpack2.h> + typedef struct { UCHAR PacketSize; // 00h - Size of packet (10h or 18h) @@ -38,6 +41,38 @@ // Commented since some earlier BIOSes refuse to work with // such extended structure } I386_DISK_ADDRESS_PACKET, *PI386_DISK_ADDRESS_PACKET; + +typedef struct +{ + UCHAR PacketSize; // 00h - Size of packet in bytes (13h) + UCHAR MediaType; // 01h - Boot media type (see #00282) + UCHAR DriveNumber; /* 02h - Drive number: + * 00h Floppy image + * 80h Bootable hard disk + * 81h-FFh Nonbootable or no emulation + */ + UCHAR Controller; // 03h - CD-ROM controller number + ULONG LBAImage; // 04h - Logical Block Address of disk image to emulate + USHORT DeviceSpec; /* 08h - Device specification (see also #00282) + * (IDE) Bit 0: + * Drive is slave instead of master + * (SCSI) Bits 7-0: + * LUN and PUN + * Bits 15-8: + * Bus number + */ + USHORT Buffer; // 0Ah - Segment of 3K buffer for caching CD-ROM reads + USHORT LoadSeg; // 0Ch - Load segment for initial boot image. + // If 0000h, load at segment 07C0h. + USHORT SectorCount; // 0Eh - Number of 512-byte virtual sectors to load + // (only valid for AH=4Ch). + UCHAR CHSGeometry[3]; /* 10h - Low byte of cylinder count (for INT 13/AH=08h) + * 11h - Sector count, high bits of cylinder count (for INT 13/AH=08h) + * 12h - Head count (for INT 13/AH=08h) + */ + UCHAR Reserved; +} I386_CDROM_SPEC_PACKET, *PI386_CDROM_SPEC_PACKET; + #include <poppack.h> /* FUNCTIONS *****************************************************************/ @@ -540,6 +575,69 @@ } } + +static BOOLEAN +FallbackDiskIsCdRomDrive(UCHAR DriveNumber) +{ + MASTER_BOOT_RECORD MasterBootRecord; + + TRACE("FallbackDiskIsCdRomDrive(0x%x)\n", DriveNumber); + + /* CD-ROM drive numbers are always > 0x80 */ + if (DriveNumber <= 0x80) + return FALSE; + + /* + * We suppose that a CD-ROM does not have a MBR + * (not always true: example of the Hybrid USB-ISOs). + */ + return !DiskReadBootRecord(DriveNumber, 0, &MasterBootRecord); +} + +BOOLEAN DiskIsCdRomDrive(UCHAR DriveNumber) +{ + REGS RegsIn, RegsOut; + PI386_CDROM_SPEC_PACKET Packet = (PI386_CDROM_SPEC_PACKET)(BIOSCALLBUFFER); + + TRACE("DiskIsCdRomDrive(0x%x)\n", DriveNumber); + + /* CD-ROM drive numbers are always > 0x80 */ + if (DriveNumber <= 0x80) + return FALSE; + + /* Setup disk address packet */ + RtlZeroMemory(Packet, sizeof(*Packet)); + Packet->PacketSize = sizeof(*Packet); + + /* + * BIOS Int 13h, function 4B01h - Bootable CD-ROM - Get Disk Emulation Status + * AX = 4B01h + * DL = drive number + * DS:SI -> empty specification packet + * Return: + * CF clear if successful + * CF set on error + * AX = return codes + * DS:SI specification packet filled + */ + RegsIn.w.ax = 0x4B01; + RegsIn.b.dl = DriveNumber; + RegsIn.x.ds = BIOSCALLBUFSEGMENT; // DS:SI -> specification packet + RegsIn.w.si = BIOSCALLBUFOFFSET; + + Int386(0x13, &RegsIn, &RegsOut); + + // return (INT386_SUCCESS(RegsOut) && (Packet->DriveNumber == DriveNumber)); + /* + * If the simple test failed, try to use the fallback code, + * but we can be on *very* thin ice. + */ + if (!INT386_SUCCESS(RegsOut) || (Packet->DriveNumber != DriveNumber)) + return FallbackDiskIsCdRomDrive(DriveNumber); + else + return TRUE; +} + BOOLEAN PcDiskGetBootPath(OUT PCHAR BootPath, IN ULONG Size) { @@ -550,6 +648,17 @@ // we were booting from network (and: PC --> PXE, etc...) // and if so, set the correct ARC path. But then this new // logic could be moved back to DiskGetBootPath... + + if (*FrldrBootPath) + { + /* Copy back the buffer */ + if (Size < strlen(FrldrBootPath) + 1) + return FALSE; + strncpy(BootPath, FrldrBootPath, Size); + return TRUE; + } + + // FIXME! FIXME! Do this in some drive recognition procedure!!!! if (PxeInit()) { strcpy(BootPath, "net(0)"); Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/disk.c [iso-8859-1] Sun Jan 29 15:43:12 2017 @@ -24,6 +24,8 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(DISK); + +CHAR FrldrBootPath[MAX_PATH] = ""; static BOOLEAN bReportError = TRUE; @@ -98,93 +100,55 @@ return TRUE; } -BOOLEAN -DiskGetBootPath(OUT PCHAR BootPath, IN ULONG Size) + +extern BOOLEAN +DiskIsCdRomDrive(UCHAR DriveNumber); + +BOOLEAN DiskGetBootPath(OUT PCHAR BootPath, IN ULONG Size) { - static char Path[] = "multi(0)disk(0)"; - char Device[4]; - MASTER_BOOT_RECORD MasterBootRecord; + if (*FrldrBootPath) + goto Done; /* 0x49 is our magic ramdisk drive, so try to detect it first */ if (FrldrBootDrive == 0x49) { /* This is the ramdisk. See ArmDiskGetBootPath too... */ - - PCCH RamDiskPath = "ramdisk(0)"; - - if (Size < sizeof(RamDiskPath)) - { - return FALSE; - } - - strcpy(BootPath, RamDiskPath); + // sprintf(FrldrBootPath, "ramdisk(%u)", 0); + strcpy(FrldrBootPath, "ramdisk(0)"); } else if (FrldrBootDrive < 0x80) { /* This is a floppy */ - - if (Size <= sizeof(Path) + 7 + sizeof(Device)) - { - return FALSE; - } - - strcpy(BootPath, Path); - - _itoa(FrldrBootDrive, Device, 10); - strcat(BootPath, "fdisk("); - strcat(BootPath, Device); - strcat(BootPath, ")"); + sprintf(FrldrBootPath, "multi(0)disk(0)fdisk(%u)", FrldrBootDrive); } - /* FIXME */ - else if (DiskReadBootRecord(FrldrBootDrive, 0, &MasterBootRecord)) + else if (DiskIsCdRomDrive(FrldrBootDrive)) + { + /* This is a CD-ROM drive */ + sprintf(FrldrBootPath, "multi(0)disk(0)cdrom(%u)", FrldrBootDrive - 0x80); + } + else { ULONG BootPartition; PARTITION_TABLE_ENTRY PartitionEntry; - char Partition[4]; /* This is a hard disk */ if (!DiskGetActivePartitionEntry(FrldrBootDrive, &PartitionEntry, &BootPartition)) { - DbgPrint("Invalid active partition information\n"); + ERR("Invalid active partition information\n"); return FALSE; } FrldrBootPartition = BootPartition; - if (Size <= sizeof(Path) + 18 + sizeof(Device) + sizeof(Partition)) - { - return FALSE; - } - - strcpy(BootPath, Path); - - _itoa(FrldrBootDrive - 0x80, Device, 10); - strcat(BootPath, "rdisk("); - strcat(BootPath, Device); - strcat(BootPath, ")"); - - _itoa(FrldrBootPartition, Partition, 10); - strcat(BootPath, "partition("); - strcat(BootPath, Partition); - strcat(BootPath, ")"); - } - else - { - /* This is a CD-ROM drive */ - - if (Size <= sizeof(Path) + 7 + sizeof(Device)) - { - return FALSE; - } - - strcpy(BootPath, Path); - - _itoa(FrldrBootDrive - 0x80, Device, 10); - strcat(BootPath, "cdrom("); - strcat(BootPath, Device); - strcat(BootPath, ")"); + sprintf(FrldrBootPath, "multi(0)disk(0)rdisk(%u)partition(%lu)", + FrldrBootDrive - 0x80, FrldrBootPartition); } +Done: + /* Copy back the buffer */ + if (Size < strlen(FrldrBootPath) + 1) + return FALSE; + strncpy(BootPath, FrldrBootPath, Size); return TRUE; } Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] Sun Jan 29 15:43:12 2017 @@ -121,16 +121,21 @@ // FreeLoader Disk Functions // /////////////////////////////////////////////////////////////////////////////////////// -VOID DiskReportError (BOOLEAN bError); +VOID DiskReportError(BOOLEAN bError); VOID DiskError(PCSTR ErrorString, ULONG ErrorCode); PCSTR DiskGetErrorCodeString(ULONG ErrorCode); BOOLEAN DiskIsDriveRemovable(UCHAR DriveNumber); + +BOOLEAN DiskGetBootPath(OUT PCHAR BootPath, IN ULONG Size); +/* Platform-specific boot drive and partition numbers */ extern UCHAR FrldrBootDrive; extern ULONG FrldrBootPartition; +/* ARC path of the boot drive and partition */ +extern CHAR FrldrBootPath[MAX_PATH]; + +/* Buffer for disk reads */ extern PVOID DiskReadBuffer; extern SIZE_T DiskReadBufferSize; - -BOOLEAN DiskGetBootPath(OUT PCHAR BootPath, IN ULONG Size); ///////////////////////////////////////////////////////////////////////////////////////

7 years, 10 months

[tfaber] 73620: [CALC] - Do not push memory stores onto the operation stack since they can't be acted upon. Based on a patch by Katayama Hirofumi MZ. CORE-12325 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jan 29 14:25:28 2017 New Revision: 73620 URL: http://svn.reactos.org/svn/reactos?rev=73620&view=rev Log: [CALC] - Do not push memory stores onto the operation stack since they can't be acted upon. Based on a patch by Katayama Hirofumi MZ. CORE-12325 #resolve Modified: trunk/reactos/base/applications/calc/winmain.c Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… ============================================================================== --- trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/winmain.c [iso-8859-1] Sun Jan 29 14:25:28 2017 @@ -212,8 +212,8 @@ { IDC_BUTTON_DMS, MODIFIER_INV, 1, rpn_dec2dms, rpn_dms2dec, NULL, NULL }, { IDC_BUTTON_FE, 0, 1, run_fe, NULL, NULL, NULL }, { IDC_BUTTON_DAT, 0, 1, run_dat_sta, NULL, NULL, NULL, }, - { IDC_BUTTON_MP, MODIFIER_INV, 1, run_mp, run_mm, NULL, NULL, }, - { IDC_BUTTON_MS, MODIFIER_INV, 1, run_ms, run_mw, NULL, NULL, }, + { IDC_BUTTON_MP, MODIFIER_INV|NO_CHAIN, 1, run_mp, run_mm, NULL, NULL, }, + { IDC_BUTTON_MS, MODIFIER_INV|NO_CHAIN, 1, run_ms, run_mw, NULL, NULL, }, { IDC_BUTTON_CANC, NO_CHAIN, 0, run_canc, NULL, NULL, NULL, }, { IDC_BUTTON_RIGHTPAR, NO_CHAIN, 1, run_rpar, NULL, NULL, NULL, }, { IDC_BUTTON_LEFTPAR, NO_CHAIN, 0, run_lpar, NULL, NULL, NULL, },

7 years, 10 months

[hbelusca] 73619: [SHELL32]: Fix build on *sane* compilers (wth, is that an assignment without the equal sign, or a called constructor, missing its parentheses?!).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 29 13:48:39 2017 New Revision: 73619 URL: http://svn.reactos.org/svn/reactos?rev=73619&view=rev Log: [SHELL32]: Fix build on *sane* compilers (wth, is that an assignment without the equal sign, or a called constructor, missing its parentheses?!). Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Sun Jan 29 13:48:39 2017 @@ -2828,7 +2828,7 @@ /* Map from global to client coordinates and query the index of the listview-item, which is * currently under the mouse cursor. */ - LVHITTESTINFO htinfo { {pt.x, pt.y}, LVHT_ONITEM}; + LVHITTESTINFO htinfo = {{pt.x, pt.y}, LVHT_ONITEM}; ScreenToClient(&htinfo.pt); lResult = m_ListView.HitTest(&htinfo);

7 years, 10 months

[hbelusca] 73618: [FREELDR]: Part 3 of my local changes merging: - Remove the DiskVtbl functions (machxbox.c) of the XBOX and share them instead with those of the PC, since they are basically the s...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jan 29 02:35:28 2017 New Revision: 73618 URL: http://svn.reactos.org/svn/reactos?rev=73618&view=rev Log: [FREELDR]: Part 3 of my local changes merging: - Remove the DiskVtbl functions (machxbox.c) of the XBOX and share them instead with those of the PC, since they are basically the same. They just however differ by which 'DiskGetPartitionEntry' function they use. To cope with this, 'DiskGetPartitionEntry' becomes a pointer to either the default function 'DiskGetMbrPartitionEntry' (which indeed assumes a MBR-layout, see partition.c), or the special function 'XboxDiskGetPartitionEntry' in the case of partitionless XBOX disks. Note that, by the way, partition.c should in the future support GPT-layout disks as well... - The boot devices pre-initialization code can also be shared as well, thus getting rid of 'XboxInitializeBootDevices', because we note that this is exactly what the (old) XBOX version of 'DetectBiosDisks' did at its beginning. - But then, we can also share 'DetectBiosDisks' XBOX code with its PC version, and also *fix* the PC code version as well! 'DetectSystem' and 'DetectBiosDisks' are therefore merged *as they should be*. Thanks to the boot devices pre-initialization code that has run before the hardware detection, 'DetectBiosDisks' can just use the cached information. - Now we correctly initialize the PC root HW system configuration key: we first create it, then, after the bios disks (floppies + HDDs) are enumerated we set the BIOS INT13h disk data to the system key's configuration data. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c trunk/reactos/boot/freeldr/freeldr/disk/partition.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h trunk/reactos/boot/freeldr/freeldr/include/disk.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Sun Jan 29 02:35:28 2017 @@ -37,12 +37,11 @@ static unsigned int delay_count = 1; extern UCHAR PcBiosDiskCount; +/* This function is slightly different in its PC and XBOX versions */ +GET_HARDDISK_CONFIG_DATA GetHarddiskConfigurationData = NULL; + PCHAR -GetHarddiskIdentifier( - UCHAR DriveNumber); - -BOOLEAN -InitializeBiosDisks(VOID); +GetHarddiskIdentifier(UCHAR DriveNumber); /* FUNCTIONS *****************************************************************/ @@ -351,18 +350,28 @@ return ControllerKey; } -PCONFIGURATION_COMPONENT_DATA -DetectSystem(VOID) -{ - PCONFIGURATION_COMPONENT_DATA SystemKey; +VOID +DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, + PCONFIGURATION_COMPONENT_DATA BusKey) +{ + PCONFIGURATION_COMPONENT_DATA ControllerKey, DiskKey; PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_INT13_DRIVE_PARAMETER Int13Drives; GEOMETRY Geometry; - UCHAR DiskCount; + UCHAR DiskCount, DriveNumber; USHORT i; ULONG Size; + /* The pre-enumeration of the BIOS disks was already done in InitializeBootDevices() */ DiskCount = PcBiosDiskCount; + + /* Use the floppy disk controller as our controller */ + ControllerKey = DetectBiosFloppyController(BusKey); + if (!ControllerKey) + { + ERR("Failed to detect BIOS disk controller\n"); + return; + } /* Allocate resource descriptor */ Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + @@ -371,7 +380,7 @@ if (PartialResourceList == NULL) { ERR("Failed to allocate resource descriptor\n"); - return NULL; + return; } /* Initialize resource descriptor */ @@ -389,16 +398,18 @@ Int13Drives = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); for (i = 0; i < DiskCount; i++) { - if (MachDiskGetDriveGeometry(0x80 + i, &Geometry)) + DriveNumber = 0x80 + i; + + if (MachDiskGetDriveGeometry(DriveNumber, &Geometry)) { - Int13Drives[i].DriveSelect = 0x80 + i; + Int13Drives[i].DriveSelect = DriveNumber; Int13Drives[i].MaxCylinders = Geometry.Cylinders - 1; Int13Drives[i].SectorsPerTrack = (USHORT)Geometry.Sectors; Int13Drives[i].MaxHeads = (USHORT)Geometry.Heads - 1; Int13Drives[i].NumberDrives = DiskCount; TRACE("Disk %x: %u Cylinders %u Heads %u Sectors %u Bytes\n", - 0x80 + i, + DriveNumber, Geometry.Cylinders - 1, Geometry.Heads - 1, Geometry.Sectors, @@ -406,47 +417,15 @@ } } - FldrCreateComponentKey(NULL, - SystemClass, - MaximumType, - 0x0, - 0x0, - 0xFFFFFFFF, - NULL, - PartialResourceList, - Size, - &SystemKey); - - return SystemKey; -} - -extern PCM_PARTIAL_RESOURCE_LIST -PcGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize); - -#define GetHarddiskConfigurationData PcGetHarddiskConfigurationData - -// static -VOID -DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA BusKey) -{ - PCONFIGURATION_COMPONENT_DATA ControllerKey, DiskKey; - ULONG i; - - /* Use the floppy disk controller as our controller */ - ControllerKey = DetectBiosFloppyController(BusKey); - if (!ControllerKey) - { - ERR("Failed to detect BIOS disk controller\n"); - return; - } + /* Update the 'System' key's configuration data with BIOS INT13h information */ + FldrSetConfigurationData(SystemKey, PartialResourceList, Size); /* Create and fill subkey for each harddisk */ - for (i = 0; i < PcBiosDiskCount; i++) - { - PCM_PARTIAL_RESOURCE_LIST PartialResourceList; - ULONG Size; + for (i = 0; i < DiskCount; i++) + { PCHAR Identifier; - UCHAR DriveNumber = 0x80 + (UCHAR)i; + + DriveNumber = 0x80 + i; /* Get disk values */ PartialResourceList = GetHarddiskConfigurationData(DriveNumber, &Size); Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c [iso-8859-1] Sun Jan 29 02:35:28 2017 @@ -26,6 +26,10 @@ DBG_DEFAULT_CHANNEL(HWDETECT); +/* + * This is the common code for harddisk for both the PC and the XBOX. + */ + typedef struct tagDISKCONTEXT { UCHAR DriveNumber; @@ -49,8 +53,7 @@ /* FUNCTIONS *****************************************************************/ -// static -ARC_STATUS +static ARC_STATUS DiskClose(ULONG FileId) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); @@ -59,8 +62,7 @@ return ESUCCESS; } -// static -ARC_STATUS +static ARC_STATUS DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); @@ -131,8 +133,7 @@ return ESUCCESS; } -// static -ARC_STATUS +static ARC_STATUS DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); @@ -177,8 +178,7 @@ return (!ret) ? EIO : ESUCCESS; } -// static -ARC_STATUS +static ARC_STATUS DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); @@ -203,15 +203,13 @@ PCHAR -GetHarddiskIdentifier( - UCHAR DriveNumber) +GetHarddiskIdentifier(UCHAR DriveNumber) { return PcDiskIdentifier[DriveNumber - 0x80]; } -VOID -GetHarddiskInformation( - UCHAR DriveNumber) +static VOID +GetHarddiskInformation(UCHAR DriveNumber) { PMASTER_BOOT_RECORD Mbr; PULONG Buffer; @@ -330,6 +328,7 @@ break; } + /* Cache the BIOS hard disk information for later use */ GetHarddiskInformation(DriveNumber); /* Check if we have seen the boot drive */ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] Sun Jan 29 02:35:28 2017 @@ -78,9 +78,9 @@ #define CONTROLLER_TIMEOUT 250 -// NOTE: Similar to xboxhw.c!XboxGetHarddiskConfigurationData(), +// NOTE: Similar to machxbox.c!XboxGetHarddiskConfigurationData(), // but with extended geometry support. -// static +static PCM_PARTIAL_RESOURCE_LIST PcGetHarddiskConfigurationData(UCHAR DriveNumber, ULONG* pSize) { @@ -811,7 +811,7 @@ TRACE("DetectParallelPorts() done\n"); } -//static +// static BOOLEAN DetectKeyboardDevice(VOID) { @@ -1252,9 +1252,6 @@ } } -extern VOID -DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA BusKey); - static VOID DetectIsaBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber) @@ -1295,7 +1292,7 @@ (*BusNumber)++; /* Detect ISA/BIOS devices */ - DetectBiosDisks(BusKey); + DetectBiosDisks(SystemKey, BusKey); DetectSerialPorts(BusKey); DetectParallelPorts(BusKey); DetectKeyboardController(BusKey); @@ -1305,9 +1302,6 @@ /* FIXME: Detect more ISA devices */ } -extern PCONFIGURATION_COMPONENT_DATA -DetectSystem(VOID); - PCONFIGURATION_COMPONENT_DATA PcHwDetect(VOID) { @@ -1317,7 +1311,10 @@ TRACE("DetectHardware()\n"); /* Create the 'System' key */ - SystemKey = DetectSystem(); + FldrCreateSystemKey(&SystemKey); + // TODO: Discover and set the machine type as the Component->Identifier + + GetHarddiskConfigurationData = PcGetHarddiskConfigurationData; /* Detect buses */ DetectPciBios(SystemKey, &BusNumber); @@ -1325,6 +1322,9 @@ DetectPnpBios(SystemKey, &BusNumber); DetectIsaBios(SystemKey, &BusNumber); // TODO: Detect first EISA or MCA, before ISA DetectAcpiBios(SystemKey, &BusNumber); + + // TODO: Collect the ROM blocks from 0xC0000 to 0xF0000 and append their + // CM_ROM_BLOCK data into the 'System' key's configuration data. TRACE("DetectHardware() Done\n"); return SystemKey; @@ -1387,6 +1387,8 @@ MachVtbl.InitializeBootDevices = PcInitializeBootDevices; MachVtbl.HwDetect = PcHwDetect; MachVtbl.HwIdle = PcHwIdle; + + // DiskGetPartitionEntry = DiskGetMbrPartitionEntry; // Default } VOID Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c [iso-8859-1] Sun Jan 29 02:35:28 2017 @@ -24,23 +24,7 @@ DBG_DEFAULT_CHANNEL(HWDETECT); -static CHAR Hex[] = "0123456789ABCDEF"; - -extern ULONG reactos_disk_count; -extern ARC_DISK_SIGNATURE_EX reactos_arc_disk_info[]; - -typedef struct tagDISKCONTEXT -{ - UCHAR DriveNumber; - ULONG SectorSize; - ULONGLONG SectorOffset; - ULONGLONG SectorCount; - ULONGLONG SectorNumber; -} DISKCONTEXT; - - - -// NOTE: Similar to hardware.c!PcGetHarddiskConfigurationData(), +// NOTE: Similar to machpc.c!PcGetHarddiskConfigurationData(), // but without extended geometry support. static PCM_PARTIAL_RESOURCE_LIST @@ -110,302 +94,6 @@ *pSize = Size; return PartialResourceList; } - -#define GetHarddiskConfigurationData XboxGetHarddiskConfigurationData - - -extern ARC_STATUS -DiskClose(ULONG FileId); - -extern ARC_STATUS -DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information); - -static -ARC_STATUS -DiskOpen(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) -{ - DISKCONTEXT* Context; - ULONG DrivePartition, SectorSize; - UCHAR DriveNumber; - ULONGLONG SectorOffset = 0; - ULONGLONG SectorCount = 0; - PARTITION_TABLE_ENTRY PartitionTableEntry; - CHAR FileName[1]; - - if (!DissectArcPath(Path, FileName, &DriveNumber, &DrivePartition)) - return EINVAL; - - if (DrivePartition == 0xff) - { - /* This is a CD-ROM device */ - SectorSize = 2048; - } - else - { - /* This is either a floppy disk device (DrivePartition == 0) or - * a hard disk device (DrivePartition != 0 && DrivePartition != 0xFF) but - * it doesn't matter which one because they both have 512 bytes per sector */ - SectorSize = 512; - } - - if (DrivePartition != 0xff && DrivePartition != 0) - { - if (!XboxDiskGetPartitionEntry(DriveNumber, DrivePartition, &PartitionTableEntry)) - return EINVAL; - SectorOffset = PartitionTableEntry.SectorCountBeforePartition; - SectorCount = PartitionTableEntry.PartitionSectorCount; - } - else - { - SectorCount = 0; /* FIXME */ - } - - Context = FrLdrTempAlloc(sizeof(DISKCONTEXT), TAG_HW_DISK_CONTEXT); - if (!Context) - return ENOMEM; - Context->DriveNumber = DriveNumber; - Context->SectorSize = SectorSize; - Context->SectorOffset = SectorOffset; - Context->SectorCount = SectorCount; - Context->SectorNumber = 0; - FsSetDeviceSpecific(*FileId, Context); - - return ESUCCESS; -} - -extern ARC_STATUS -DiskRead(ULONG FileId, VOID* Buffer, ULONG N, ULONG* Count); - -extern ARC_STATUS -DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode); - -static const DEVVTBL DiskVtbl = -{ - DiskClose, - DiskGetFileInformation, - DiskOpen, - DiskRead, - DiskSeek, -}; - -static -VOID -GetHarddiskIdentifier(PCHAR Identifier, - UCHAR DriveNumber) -{ - PMASTER_BOOT_RECORD Mbr; - PULONG Buffer; - ULONG i; - ULONG Checksum; - ULONG Signature; - CHAR ArcName[MAX_PATH]; - PARTITION_TABLE_ENTRY PartitionTableEntry; - - /* Read the MBR */ - if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, DiskReadBuffer)) - { - ERR("Reading MBR failed\n"); - return; - } - - Buffer = (ULONG*)DiskReadBuffer; - Mbr = (PMASTER_BOOT_RECORD)DiskReadBuffer; - - Signature = Mbr->Signature; - TRACE("Signature: %x\n", Signature); - - /* Calculate the MBR checksum */ - Checksum = 0; - for (i = 0; i < 512 / sizeof(ULONG); i++) - { - Checksum += Buffer[i]; - } - Checksum = ~Checksum + 1; - TRACE("Checksum: %x\n", Checksum); - - /* Fill out the ARC disk block */ - reactos_arc_disk_info[reactos_disk_count].DiskSignature.Signature = Signature; - reactos_arc_disk_info[reactos_disk_count].DiskSignature.CheckSum = Checksum; - sprintf(ArcName, "multi(0)disk(0)rdisk(%lu)", reactos_disk_count); - strcpy(reactos_arc_disk_info[reactos_disk_count].ArcName, ArcName); - reactos_arc_disk_info[reactos_disk_count].DiskSignature.ArcName = - reactos_arc_disk_info[reactos_disk_count].ArcName; - reactos_disk_count++; - - sprintf(ArcName, "multi(0)disk(0)rdisk(%u)partition(0)", DriveNumber - 0x80); - FsRegisterDevice(ArcName, &DiskVtbl); - - /* Add partitions */ - i = 1; - DiskReportError(FALSE); - while (XboxDiskGetPartitionEntry(DriveNumber, i, &PartitionTableEntry)) - { - if (PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) - { - sprintf(ArcName, "multi(0)disk(0)rdisk(%u)partition(%lu)", DriveNumber - 0x80, i); - FsRegisterDevice(ArcName, &DiskVtbl); - } - i++; - } - DiskReportError(TRUE); - - /* Convert checksum and signature to identifier string */ - Identifier[0] = Hex[(Checksum >> 28) & 0x0F]; - Identifier[1] = Hex[(Checksum >> 24) & 0x0F]; - Identifier[2] = Hex[(Checksum >> 20) & 0x0F]; - Identifier[3] = Hex[(Checksum >> 16) & 0x0F]; - Identifier[4] = Hex[(Checksum >> 12) & 0x0F]; - Identifier[5] = Hex[(Checksum >> 8) & 0x0F]; - Identifier[6] = Hex[(Checksum >> 4) & 0x0F]; - Identifier[7] = Hex[Checksum & 0x0F]; - Identifier[8] = '-'; - Identifier[9] = Hex[(Signature >> 28) & 0x0F]; - Identifier[10] = Hex[(Signature >> 24) & 0x0F]; - Identifier[11] = Hex[(Signature >> 20) & 0x0F]; - Identifier[12] = Hex[(Signature >> 16) & 0x0F]; - Identifier[13] = Hex[(Signature >> 12) & 0x0F]; - Identifier[14] = Hex[(Signature >> 8) & 0x0F]; - Identifier[15] = Hex[(Signature >> 4) & 0x0F]; - Identifier[16] = Hex[Signature & 0x0F]; - Identifier[17] = '-'; - Identifier[18] = 'A'; - Identifier[19] = 0; - TRACE("Identifier: %s\n", Identifier); -} - -static -VOID -DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, - PCONFIGURATION_COMPONENT_DATA BusKey) -{ - PCM_PARTIAL_RESOURCE_LIST PartialResourceList; - PCM_INT13_DRIVE_PARAMETER Int13Drives; - GEOMETRY Geometry; - PCONFIGURATION_COMPONENT_DATA DiskKey, ControllerKey; - UCHAR DiskCount; - ULONG i; - ULONG Size; - BOOLEAN Changed; - - /* Count the number of visible drives */ - DiskReportError(FALSE); - DiskCount = 0; - - /* There are some really broken BIOSes out there. There are even BIOSes - * that happily report success when you ask them to read from non-existent - * harddisks. So, we set the buffer to known contents first, then try to - * read. If the BIOS reports success but the buffer contents haven't - * changed then we fail anyway */ - memset(DiskReadBuffer, 0xcd, DiskReadBufferSize); - while (MachDiskReadLogicalSectors(0x80 + DiskCount, 0ULL, 1, DiskReadBuffer)) - { - Changed = FALSE; - for (i = 0; ! Changed && i < DiskReadBufferSize; i++) - { - Changed = ((PUCHAR)DiskReadBuffer)[i] != 0xcd; - } - if (! Changed) - { - TRACE("BIOS reports success for disk %d but data didn't change\n", - (int)DiskCount); - break; - } - DiskCount++; - memset(DiskReadBuffer, 0xcd, DiskReadBufferSize); - } - DiskReportError(TRUE); - TRACE("BIOS reports %d harddisk%s\n", - (int)DiskCount, (DiskCount == 1) ? "" : "s"); - - //DetectBiosFloppyController(BusKey); - - /* Allocate resource descriptor */ - Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + - sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; - PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); - if (PartialResourceList == NULL) - { - ERR("Failed to allocate resource descriptor\n"); - return; - } - - /* Initialize resource descriptor */ - memset(PartialResourceList, 0, Size); - PartialResourceList->Version = 1; - PartialResourceList->Revision = 1; - PartialResourceList->Count = 1; - PartialResourceList->PartialDescriptors[0].Type = CmResourceTypeDeviceSpecific; - PartialResourceList->PartialDescriptors[0].ShareDisposition = 0; - PartialResourceList->PartialDescriptors[0].Flags = 0; - PartialResourceList->PartialDescriptors[0].u.DeviceSpecificData.DataSize = - sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; - - /* Get harddisk Int13 geometry data */ - Int13Drives = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); - for (i = 0; i < DiskCount; i++) - { - if (MachDiskGetDriveGeometry(0x80 + i, &Geometry)) - { - Int13Drives[i].DriveSelect = 0x80 + i; - Int13Drives[i].MaxCylinders = Geometry.Cylinders - 1; - Int13Drives[i].SectorsPerTrack = (USHORT)Geometry.Sectors; - Int13Drives[i].MaxHeads = (USHORT)Geometry.Heads - 1; - Int13Drives[i].NumberDrives = DiskCount; - - TRACE( - "Disk %x: %u Cylinders %u Heads %u Sectors %u Bytes\n", - 0x80 + i, - Geometry.Cylinders - 1, - Geometry.Heads - 1, - Geometry.Sectors, - Geometry.BytesPerSector); - } - } - - FldrCreateComponentKey(BusKey, - ControllerClass, - DiskController, - Output | Input, - 0, - 0xFFFFFFFF, - NULL, - PartialResourceList, - Size, - &ControllerKey); - TRACE("Created key: DiskController\\0\n"); - - /* Create and fill subkey for each harddisk */ - for (i = 0; i < DiskCount; i++) - { - CHAR Identifier[20]; - - /* Get disk values */ - PartialResourceList = GetHarddiskConfigurationData(0x80 + i, &Size); - GetHarddiskIdentifier(Identifier, 0x80 + i); - - /* Create disk key */ - FldrCreateComponentKey(ControllerKey, - PeripheralClass, - DiskPeripheral, - Output | Input, - 0, - 0xFFFFFFFF, - Identifier, - PartialResourceList, - Size, - &DiskKey); - } -} - -BOOLEAN -XboxInitializeBootDevices(VOID) -{ - // Emulate old behavior - return XboxHwDetect() != NULL; -} - - - static VOID @@ -462,6 +150,8 @@ /* Create the 'System' key */ FldrCreateSystemKey(&SystemKey); + + GetHarddiskConfigurationData = XboxGetHarddiskConfigurationData; /* TODO: Build actual xbox's hardware configuration tree */ DetectIsaBios(SystemKey, &BusNumber); @@ -515,6 +205,8 @@ MachVtbl.HwDetect = XboxHwDetect; MachVtbl.HwIdle = XboxHwIdle; + DiskGetPartitionEntry = XboxDiskGetPartitionEntry; + /* Set LEDs to orange after init */ XboxSetLED("oooo"); } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c [iso-8859-1] Sun Jan 29 02:35:28 2017 @@ -175,7 +175,6 @@ (WRITE_PORT_UCHAR((PUCHAR)((Address) + IDE_REG_DEV_CNTRL), (Data))) /* IDE_DRIVE_IDENTIFY */ - typedef struct _IDE_DRIVE_IDENTIFY { USHORT ConfigBits; /*00*/ @@ -494,8 +493,8 @@ } } - /* No magic Xbox partitions. Maybe there's a MBR */ - return DiskGetPartitionEntry(DriveNumber, PartitionNumber, PartitionTableEntry); + /* No magic Xbox partitions, maybe there's a MBR */ + return DiskGetMbrPartitionEntry(DriveNumber, PartitionNumber, PartitionTableEntry); } BOOLEAN Modified: trunk/reactos/boot/freeldr/freeldr/disk/partition.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/partition.c [iso-8859-1] Sun Jan 29 02:35:28 2017 @@ -17,19 +17,29 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/* + * TODO: This is here where we should add support for GPT partitions + * as well as partitionless disks! + */ + #ifndef _M_ARM #include <freeldr.h> + +#define NDEBUG #include <debug.h> DBG_DEFAULT_CHANNEL(DISK); +/* This function serves to retrieve a partition entry for devices that handle partitions differently */ +DISK_GET_PARTITION_ENTRY DiskGetPartitionEntry = DiskGetMbrPartitionEntry; + BOOLEAN DiskGetActivePartitionEntry(UCHAR DriveNumber, - PPARTITION_TABLE_ENTRY PartitionTableEntry, - ULONG *ActivePartition) -{ - ULONG BootablePartitionCount = 0; - ULONG CurrentPartitionNumber; - ULONG Index; + PPARTITION_TABLE_ENTRY PartitionTableEntry, + ULONG *ActivePartition) +{ + ULONG BootablePartitionCount = 0; + ULONG CurrentPartitionNumber; + ULONG Index; MASTER_BOOT_RECORD MasterBootRecord; PPARTITION_TABLE_ENTRY ThisPartitionTableEntry; @@ -81,15 +91,15 @@ return TRUE; } -BOOLEAN DiskGetPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry) -{ - MASTER_BOOT_RECORD MasterBootRecord; - PARTITION_TABLE_ENTRY ExtendedPartitionTableEntry; - ULONG ExtendedPartitionNumber; - ULONG ExtendedPartitionOffset; - ULONG Index; - ULONG CurrentPartitionNumber; - PPARTITION_TABLE_ENTRY ThisPartitionTableEntry; +BOOLEAN DiskGetMbrPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry) +{ + MASTER_BOOT_RECORD MasterBootRecord; + PARTITION_TABLE_ENTRY ExtendedPartitionTableEntry; + ULONG ExtendedPartitionNumber; + ULONG ExtendedPartitionOffset; + ULONG Index; + ULONG CurrentPartitionNumber; + PPARTITION_TABLE_ENTRY ThisPartitionTableEntry; // Read master boot record if (!DiskReadBootRecord(DriveNumber, 0, &MasterBootRecord)) @@ -101,7 +111,7 @@ for (Index=0; Index<4; Index++) { ThisPartitionTableEntry = &MasterBootRecord.PartitionTable[Index]; - + if (ThisPartitionTableEntry->SystemIndicator != PARTITION_ENTRY_UNUSED && ThisPartitionTableEntry->SystemIndicator != PARTITION_EXTENDED && ThisPartitionTableEntry->SystemIndicator != PARTITION_XINT13_EXTENDED) @@ -166,7 +176,7 @@ BOOLEAN DiskGetFirstPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry) { - ULONG Index; + ULONG Index; for (Index=0; Index<4; Index++) { @@ -187,7 +197,7 @@ BOOLEAN DiskGetFirstExtendedPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry) { - ULONG Index; + ULONG Index; for (Index=0; Index<4; Index++) { Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] Sun Jan 29 02:35:28 2017 @@ -57,7 +57,6 @@ TIMEINFO* XboxGetTime(VOID); -BOOLEAN XboxInitializeBootDevices(VOID); PCONFIGURATION_COMPONENT_DATA XboxHwDetect(VOID); VOID XboxHwIdle(VOID); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/hardware.h [iso-8859-1] Sun Jan 29 02:35:28 2017 @@ -23,16 +23,24 @@ #define CONFIG_CMD(bus, dev_fn, where) \ (0x80000000 | (((ULONG)(bus)) << 16) | (((dev_fn) & 0x1F) << 11) | (((dev_fn) & 0xE0) << 3) | ((where) & ~3)) -#define TAG_HW_RESOURCE_LIST 'lRwH' -#define TAG_HW_DISK_CONTEXT 'cDwH' +#define TAG_HW_RESOURCE_LIST 'lRwH' +#define TAG_HW_DISK_CONTEXT 'cDwH' /* PROTOTYPES ***************************************************************/ /* hardware.c */ +VOID StallExecutionProcessor(ULONG Microseconds); +VOID HalpCalibrateStallExecution(VOID); -VOID StallExecutionProcessor(ULONG Microseconds); +typedef +PCM_PARTIAL_RESOURCE_LIST +(*GET_HARDDISK_CONFIG_DATA)(UCHAR DriveNumber, ULONG* pSize); -VOID HalpCalibrateStallExecution(VOID); +extern GET_HARDDISK_CONFIG_DATA GetHarddiskConfigurationData; + +VOID +DetectBiosDisks(PCONFIGURATION_COMPONENT_DATA SystemKey, + PCONFIGURATION_COMPONENT_DATA BusKey); /* hwacpi.c */ VOID DetectAcpiBios(PCONFIGURATION_COMPONENT_DATA SystemKey, ULONG *BusNumber); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h [iso-8859-1] Sun Jan 29 02:35:28 2017 @@ -54,7 +54,6 @@ BOOLEAN PcDiskGetBootPath(OUT PCHAR BootPath, IN ULONG Size); BOOLEAN PcDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); -BOOLEAN PcDiskGetPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN PcDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY DriveGeometry); ULONG PcDiskGetCacheableBlockCount(UCHAR DriveNumber); Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/disk.h [iso-8859-1] Sun Jan 29 02:35:28 2017 @@ -138,8 +138,19 @@ // Fixed Disk Partition Management Functions // /////////////////////////////////////////////////////////////////////////////////////// + +/* Signature of DiskGetPartitionEntry(...) */ +typedef +BOOLEAN +(*DISK_GET_PARTITION_ENTRY)(UCHAR DriveNumber, + ULONG PartitionNumber, + PPARTITION_TABLE_ENTRY PartitionTableEntry); + +/* This function serves to retrieve a partition entry for devices that handle partitions differently */ +extern DISK_GET_PARTITION_ENTRY DiskGetPartitionEntry; + BOOLEAN DiskGetActivePartitionEntry(UCHAR DriveNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry, ULONG *ActivePartition); -BOOLEAN DiskGetPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); +BOOLEAN DiskGetMbrPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN DiskGetFirstPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN DiskGetFirstExtendedPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN DiskReadBootRecord(UCHAR DriveNumber, ULONGLONG LogicalSectorNumber, PMASTER_BOOT_RECORD BootRecord);

7 years, 10 months

[tfaber] 73617: [FREELDR] - Correctly check for buffer overflow in DetectPnpBios. Patch by Serge Gautherie. CORE-12623 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jan 29 00:00:22 2017 New Revision: 73617 URL: http://svn.reactos.org/svn/reactos?rev=73617&view=rev Log: [FREELDR] - Correctly check for buffer overflow in DetectPnpBios. Patch by Serge Gautherie. CORE-12623 #resolve Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c [iso-8859-1] Sun Jan 29 00:00:22 2017 @@ -101,7 +101,7 @@ PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); if (PartialResourceList == NULL) { - ERR("Failed to allocate a full resource descriptor\n"); + ERR("Failed to allocate resource descriptor\n"); return NULL; } @@ -170,6 +170,7 @@ ULONG FoundNodeCount; int i; ULONG PnpBufferSize; + ULONG PnpBufferSizeLimit; ULONG Size; char *Ptr; @@ -204,8 +205,9 @@ TRACE("Estimated buffer size %u\n", NodeSize * NodeCount); /* Set 'Configuration Data' value */ - Size = sizeof(CM_PARTIAL_RESOURCE_LIST) - + sizeof(CM_PNP_BIOS_INSTALLATION_CHECK) + (NodeSize * NodeCount); + PnpBufferSizeLimit = sizeof(CM_PNP_BIOS_INSTALLATION_CHECK) + + (NodeSize * NodeCount); + Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + PnpBufferSizeLimit; PartialResourceList = FrLdrHeapAlloc(Size, TAG_HW_RESOURCE_LIST); if (PartialResourceList == NULL) { @@ -229,10 +231,10 @@ /* Set installation check data */ memcpy (Ptr, InstData, sizeof(CM_PNP_BIOS_INSTALLATION_CHECK)); Ptr += sizeof(CM_PNP_BIOS_INSTALLATION_CHECK); + PnpBufferSize = sizeof(CM_PNP_BIOS_INSTALLATION_CHECK); /* Copy device nodes */ FoundNodeCount = 0; - PnpBufferSize = sizeof(CM_PNP_BIOS_INSTALLATION_CHECK); for (i = 0; i < 0xFF; i++) { NodeNumber = (UCHAR)i; @@ -247,9 +249,9 @@ DeviceNode->Size, DeviceNode->Size); - if (PnpBufferSize + DeviceNode->Size > Size) + if (PnpBufferSize + DeviceNode->Size > PnpBufferSizeLimit) { - ERR("Buffer too small!\n"); + ERR("Buffer too small! Ignoring remaining device nodes.\n"); break; }

7 years, 10 months

[hbelusca] 73616: [FREELDR]: More local changes merging, part 2/x: - Move the HW detection code specific to the PC architecture from hardware.c to machpc.c, keeping in hardware.c the code that is s...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Jan 28 23:47:35 2017 New Revision: 73616 URL: http://svn.reactos.org/svn/reactos?rev=73616&view=rev Log: [FREELDR]: More local changes merging, part 2/x: - Move the HW detection code specific to the PC architecture from hardware.c to machpc.c, keeping in hardware.c the code that is shared between PC and XBOX. - Move what remained of i386disk.c into pcdisk.c (specific to PC architecture) + code formatting. - Move what remained of xboxhw.c into machxbox.c (specific to XBOX architecture); we discover that some code related to disk management is actually shared with PC architecture (in hwdisk.c): hwdisk.c therefore contains disk-management routines common to both PC & XBOX. - xboxdisk.c: Code formatting only. - Cleanup in disk.c/disk.h Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c trunk/reactos/boot/freeldr/freeldr/disk/disk.c trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h trunk/reactos/boot/freeldr/freeldr/include/disk.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/freeldr/freeldr/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/CMake… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/machxbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/pc/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… Modified: trunk/reactos/boot/freeldr/freeldr/include/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…

7 years, 10 months

[mjansen] 73615: [EXPLORER] Re-save the start menu banner so that we can display it again (and touch the .rc so it will be used).

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Jan 28 23:05:04 2017 New Revision: 73615 URL: http://svn.reactos.org/svn/reactos?rev=73615&view=rev Log: [EXPLORER] Re-save the start menu banner so that we can display it again (and touch the .rc so it will be used). Modified: trunk/reactos/base/shell/explorer/explorer.rc trunk/reactos/base/shell/explorer/res/bmp/158.bmp Modified: trunk/reactos/base/shell/explorer/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.rc [iso-8859-1] Sat Jan 28 23:05:04 2017 @@ -160,3 +160,4 @@ #ifdef LANGUAGE_ZH_TW #include "lang/zh-TW.rc" #endif + Modified: trunk/reactos/base/shell/explorer/res/bmp/158.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/bm… ============================================================================== Binary files - no diff available.

7 years, 10 months

[gadamopoulos] 73614: [SHELL32] - CDefView: When dragging an item it shouldn't interact with itself. So you can move a folder in itself. Highlight the item that we are dragging over if it can accep...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Jan 28 21:43:53 2017 New Revision: 73614 URL: http://svn.reactos.org/svn/reactos?rev=73614&view=rev Log: [SHELL32] - CDefView: When dragging an item it shouldn't interact with itself. So you can move a folder in itself. Highlight the item that we are dragging over if it can accept the item that is being dragged. Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Sat Jan 28 21:43:53 2017 @@ -2419,7 +2419,7 @@ m_ListView.SetItemState(iItem, lvItem.state, lvItem.stateMask); - if (dwFlags & SVSI_EDIT) + if ((dwFlags & SVSI_EDIT) == SVSI_EDIT) m_ListView.EditLabel(iItem); return S_OK; @@ -2822,17 +2822,14 @@ HRESULT CDefView::drag_notify_subitem(DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) { - LVHITTESTINFO htinfo; LONG lResult; HRESULT hr; RECT clientRect; /* Map from global to client coordinates and query the index of the listview-item, which is * currently under the mouse cursor. */ - htinfo.pt.x = pt.x; - htinfo.pt.y = pt.y; - htinfo.flags = LVHT_ONITEM; - ::ScreenToClient(m_ListView, &htinfo.pt); + LVHITTESTINFO htinfo { {pt.x, pt.y}, LVHT_ONITEM}; + ScreenToClient(&htinfo.pt); lResult = m_ListView.HitTest(&htinfo); /* Send WM_*SCROLL messages every 250 ms during drag-scrolling */ @@ -2865,6 +2862,22 @@ m_ptLastMousePos = htinfo.pt; + /* We need to check if we drag the selection over itself */ + if (lResult != -1 && m_pSourceDataObject.p != NULL) + { + PCUITEMID_CHILD pidl = _PidlByItem(lResult); + + for (UINT i = 0; i < m_cidl; i++) + { + if (pidl == m_apidl[i]) + { + /* The item that is being draged is hovering itself. */ + lResult = -1; + break; + } + } + } + /* If we are still over the previous sub-item, notify it via DragOver and return. */ if (m_pCurDropTarget && lResult == m_iDragOverItem) return m_pCurDropTarget->DragOver(grfKeyState, pt, pdwEffect); @@ -2872,11 +2885,16 @@ /* We've left the previous sub-item, notify it via DragLeave and Release it. */ if (m_pCurDropTarget) { + PCUITEMID_CHILD pidl = _PidlByItem(m_iDragOverItem); + if (pidl) + SelectItem(pidl, 0); + m_pCurDropTarget->DragLeave(); m_pCurDropTarget.Release(); } m_iDragOverItem = lResult; + if (lResult == -1) { /* We are not above one of the listview's subitems. Bind to the parent folder's @@ -2898,7 +2916,14 @@ return hr; /* Notify the item just entered via DragEnter. */ - return m_pCurDropTarget->DragEnter(m_pCurDataObject, grfKeyState, pt, pdwEffect); + hr = m_pCurDropTarget->DragEnter(m_pCurDataObject, grfKeyState, pt, pdwEffect); + + if (m_iDragOverItem != -1 && pdwEffect != DROPEFFECT_NONE) + { + SelectItem(m_iDragOverItem, SVSI_SELECT); + } + + return hr; } HRESULT WINAPI CDefView::DragEnter(IDataObject *pDataObject, DWORD grfKeyState, POINTL pt, DWORD *pdwEffect) @@ -2936,12 +2961,23 @@ { ERR("GetKeyState(VK_LBUTTON): %d\n", GetKeyState(VK_LBUTTON)); - if ((m_iDragOverItem == -1) && + if ((m_iDragOverItem == -1 || m_pCurDropTarget == NULL) && (*pdwEffect & DROPEFFECT_MOVE) && /*(GetKeyState(VK_LBUTTON) != 0) &&*/ (m_pSourceDataObject.p) && (SHIsSameObject(pDataObject, m_pSourceDataObject))) { + if (m_pCurDropTarget) + { + m_pCurDropTarget->DragLeave(); + m_pCurDropTarget.Release(); + } + + /* Restore the selection */ + m_ListView.SetItemState(-1, 0, LVIS_SELECTED); + for (UINT i = 0 ; i < m_cidl; i++) + SelectItem(m_apidl[i], SVSI_SELECT); + /* Reposition the items */ int lvIndex = -1; while ((lvIndex = m_ListView.GetNextItem(lvIndex, LVNI_SELECTED)) > -1) @@ -2954,12 +2990,6 @@ m_ListView.SetItemPosition(lvIndex, &ptItem); } } - - if (m_pCurDropTarget) - { - m_pCurDropTarget->DragLeave(); - m_pCurDropTarget.Release(); - } } else if (m_pCurDropTarget) {

7 years, 10 months

← Newer
1
2
3
4
5
6
7
...
16
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2017