Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[akhaldi] 68117: [CMAKE] Introduce add_rc_deps() to take care of adding OBJECT_DEPENDS to rc source files. CORE-9806

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 13 11:05:03 2015 New Revision: 68117 URL: http://svn.reactos.org/svn/reactos?rev=68117&view=rev Log: [CMAKE] Introduce add_rc_deps() to take care of adding OBJECT_DEPENDS to rc source files. CORE-9806 Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Sat Jun 13 11:05:03 2015 @@ -800,3 +800,7 @@ else() set(ROSSYM_LIB "") endif() + +function(add_rc_deps _target_rc) + set_source_files_properties(${_target_rc} PROPERTIES OBJECT_DEPENDS "${ARGN}") +endfunction()

9 years, 4 months

[akhaldi] 68116: [USER32][UXTHEME] Properly paint the general menubar when application is themed. Brought to you by Stefano Toncich aka Tonix. CORE-9585

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Jun 13 11:00:24 2015 New Revision: 68116 URL: http://svn.reactos.org/svn/reactos?rev=68116&view=rev Log: [USER32][UXTHEME] Properly paint the general menubar when application is themed. Brought to you by Stefano Toncich aka Tonix. CORE-9585 Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c trunk/reactos/win32ss/user/user32/windows/font.c Modified: trunk/reactos/dll/win32/uxtheme/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/nonclien… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/nonclient.c [iso-8859-1] Sat Jun 13 11:00:24 2015 @@ -513,11 +513,7 @@ GetMenuItemRect(pcontext->hWnd, Menu, imenu, &Rect); -#ifdef __REACTOS__ - OffsetRect(&Rect, -pcontext->wi.rcClient.left, -pcontext->wi.rcClient.top); -#else OffsetRect(&Rect, -pcontext->wi.rcWindow.left, -pcontext->wi.rcWindow.top); -#endif SetBkColor(pcontext->hDC, GetSysColor(flat_menu ? COLOR_MENUBAR : COLOR_MENU)); SetTextColor(pcontext->hDC, GetSysColor(Item.fState & MF_GRAYED ? COLOR_GRAYTEXT : COLOR_MENUTEXT)); Modified: trunk/reactos/win32ss/user/user32/windows/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/window… ============================================================================== --- trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/windows/font.c [iso-8859-1] Sat Jun 13 11:00:24 2015 @@ -1212,14 +1212,41 @@ last_line = !(flags & DT_NOCLIP) && y + ((flags & DT_EDITCONTROL) ? 2*lh-1 : lh) > rect->bottom; strPtr = TEXT_NextLineW(hdc, strPtr, &count, line, &len, width, flags, &size, last_line, &p_retstr, tabwidth, &prefix_offset, &ellip); +#ifdef __REACTOS__ + if (flags & DT_CENTER) + { + if (((rect->right - rect->left) < size.cx) && (flags & DT_CALCRECT)) + { + x = rect->left + size.cx; + } + else + { + x = (rect->left + rect->right - size.cx) / 2; + } + } +#else if (flags & DT_CENTER) x = (rect->left + rect->right - size.cx) / 2; +#endif else if (flags & DT_RIGHT) x = rect->right - size.cx; if (flags & DT_SINGLELINE) { if (flags & DT_VCENTER) - y = rect->top + (rect->bottom - rect->top) / 2 + (invert_y ? (size.cy / 2) : (-size.cy / 2)); +#ifdef __REACTOS__ + { + if (((rect->bottom - rect->top) < (invert_y ? -size.cy : size.cy)) && (flags & DT_CALCRECT)) + { + y = rect->top + (invert_y ? -size.cy : size.cy); + } + else + { +#endif + y = rect->top + (rect->bottom - rect->top) / 2 + (invert_y ? (size.cy / 2) : (-size.cy / 2)); +#ifdef __REACTOS__ + } + } +#endif else if (flags & DT_BOTTOM) y = rect->bottom + (invert_y ? 0 : -size.cy); }

9 years, 4 months

[ekohl] 68115: [USETUP] Get rid of CheckForLinuxFdiskPartitions.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sat Jun 13 10:08:36 2015 New Revision: 68115 URL: http://svn.reactos.org/svn/reactos?rev=68115&view=rev Log: [USETUP] Get rid of CheckForLinuxFdiskPartitions. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Sat Jun 13 10:08:36 2015 @@ -80,8 +80,6 @@ static HSPFILEQ SetupFileQueue = NULL; -static BOOLEAN WarnLinuxPartitions = TRUE; - static PGENERIC_LIST ComputerList = NULL; static PGENERIC_LIST DisplayList = NULL; static PGENERIC_LIST KeyboardList = NULL; @@ -1472,29 +1470,6 @@ } DrawPartitionList(PartitionList); - - /* Warn about partitions created by Linux Fdisk */ - if (WarnLinuxPartitions == TRUE && - CheckForLinuxFdiskPartitions(PartitionList) == TRUE) - { - MUIDisplayError(ERROR_WARN_PARTITION, NULL, POPUP_WAIT_NONE); - - while (TRUE) - { - CONSOLE_ConInKey(Ir); - - if ((Ir->Event.KeyEvent.uChar.AsciiChar == 0x00) && - (Ir->Event.KeyEvent.wVirtualKeyCode == VK_F3)) /* F3 */ - { - return QUIT_PAGE; - } - else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */ - { - WarnLinuxPartitions = FALSE; - return SELECT_PARTITION_PAGE; - } - } - } if (IsUnattendedSetup) { Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Sat Jun 13 10:08:36 2015 @@ -2824,65 +2824,9 @@ } -BOOLEAN -CheckForLinuxFdiskPartitions( - PPARTLIST List) -{ -#if 0 - PDISKENTRY DiskEntry; - PPARTENTRY PartEntry; - PLIST_ENTRY Entry1; - PLIST_ENTRY Entry2; - ULONG PartitionCount; - ULONG i; - - Entry1 = List->DiskListHead.Flink; - while (Entry1 != &List->DiskListHead) - { - DiskEntry = CONTAINING_RECORD(Entry1, - DISKENTRY, - ListEntry); - - Entry2 = DiskEntry->PartListHead.Flink; - while (Entry2 != &DiskEntry->PartListHead) - { - PartEntry = CONTAINING_RECORD(Entry2, - PARTENTRY, - ListEntry); - - if (PartEntry->Unpartitioned == FALSE) - { - PartitionCount = 0; - - for (i = 0; i < 4; i++) - { - if (!IsContainerPartition(PartEntry->PartInfo[i].PartitionType) && - PartEntry->PartInfo[i].PartitionLength.QuadPart != 0ULL) - { - PartitionCount++; - } - } - - if (PartitionCount > 1) - { - return TRUE; - } - } - - Entry2 = Entry2->Flink; - } - - Entry1 = Entry1->Flink; - } -#endif - - return FALSE; -} - - static NTSTATUS -WritePartitons( +WritePartitions( IN PPARTLIST List, IN PDISKENTRY DiskEntry) { @@ -2964,7 +2908,7 @@ if (DiskEntry->Dirty == TRUE) { - WritePartitons(List, DiskEntry); + WritePartitions(List, DiskEntry); DiskEntry->Dirty = FALSE; } Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Sat Jun 13 10:08:36 2015 @@ -264,10 +264,6 @@ PPARTLIST List); BOOLEAN -CheckForLinuxFdiskPartitions( - PPARTLIST List); - -BOOLEAN WritePartitionsToDisk( PPARTLIST List);

9 years, 4 months

[dreimer] 68114: [USETUP] Update german language header.

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Jun 12 23:37:41 2015 New Revision: 68114 URL: http://svn.reactos.org/svn/reactos?rev=68114&view=rev Log: [USETUP] Update german language header. Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Fri Jun 12 23:37:41 2015 @@ -1659,9 +1659,9 @@ {STRING_NONFORMATTEDPART, "Sie wollen ReactOS auf einer neuen/unformatierten Partition installieren."}, {STRING_NONFORMATTEDSYSTEMPART, - "The system partition is not formatted yet."}, + "Die Systempartition ist noch nicht formartiert."}, {STRING_NONFORMATTEDOTHERPART, - "The new partition is not formatted yet."}, + "Die neue Partition ist noch nicht formatiert."}, {STRING_INSTALLONPART, "ReactOS wird auf dieser Partition installiert."}, {STRING_CHECKINGPART,

9 years, 4 months

[ekohl] 68113: [USETUP] Mark a disk as clean after the partition table has been written to the disk.

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Jun 12 22:56:36 2015 New Revision: 68113 URL: http://svn.reactos.org/svn/reactos?rev=68113&view=rev Log: [USETUP] Mark a disk as clean after the partition table has been written to the disk. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Fri Jun 12 22:56:36 2015 @@ -2965,6 +2965,7 @@ if (DiskEntry->Dirty == TRUE) { WritePartitons(List, DiskEntry); + DiskEntry->Dirty = FALSE; } Entry = Entry->Flink;

9 years, 4 months

[ekohl] 68112: [USETUP] - Implement mandatory filesystem selection, formatting and filesystem checks for all new partitons. - Implement optional filesystem selection, formatting and filesystem chec...

by ekohl＠svn.reactos.org

Author: ekohl Date: Fri Jun 12 21:51:57 2015 New Revision: 68112 URL: http://svn.reactos.org/svn/reactos?rev=68112&view=rev Log: [USETUP] - Implement mandatory filesystem selection, formatting and filesystem checks for all new partitons. - Implement optional filesystem selection, formatting and filesystem checks for formatted boot and install partitions. - Enable installing ReactOS on primary partitions other than the first one. Usetup will install Freeloader on the first (or active) partition (aka boot partition) and install ReactOS on the chosen partition (aka install partition). Modified: trunk/reactos/base/setup/usetup/fslist.c trunk/reactos/base/setup/usetup/fslist.h trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/lang/bg-BG.h trunk/reactos/base/setup/usetup/lang/bn-BD.h trunk/reactos/base/setup/usetup/lang/cs-CZ.h trunk/reactos/base/setup/usetup/lang/de-DE.h trunk/reactos/base/setup/usetup/lang/el-GR.h trunk/reactos/base/setup/usetup/lang/en-US.h trunk/reactos/base/setup/usetup/lang/es-ES.h trunk/reactos/base/setup/usetup/lang/et-EE.h trunk/reactos/base/setup/usetup/lang/fr-FR.h trunk/reactos/base/setup/usetup/lang/he-IL.h trunk/reactos/base/setup/usetup/lang/it-IT.h trunk/reactos/base/setup/usetup/lang/ja-JP.h trunk/reactos/base/setup/usetup/lang/lt-LT.h trunk/reactos/base/setup/usetup/lang/nl-NL.h trunk/reactos/base/setup/usetup/lang/pl-PL.h trunk/reactos/base/setup/usetup/lang/pt-BR.h trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/usetup/lang/ru-RU.h trunk/reactos/base/setup/usetup/lang/sk-SK.h trunk/reactos/base/setup/usetup/lang/sq-AL.h trunk/reactos/base/setup/usetup/lang/sv-SE.h trunk/reactos/base/setup/usetup/lang/tr-TR.h trunk/reactos/base/setup/usetup/lang/uk-UA.h trunk/reactos/base/setup/usetup/mui.h trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h Modified: trunk/reactos/base/setup/usetup/fslist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.c… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.c [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -35,7 +35,7 @@ VOID FS_AddProvider( IN OUT PFILE_SYSTEM_LIST List, - IN LPCWSTR FileSystem, + IN LPCWSTR FileSystemName, IN FORMATEX FormatFunc, IN CHKDSKEX ChkdskFunc) { @@ -45,7 +45,7 @@ if (!Item) return; - Item->FileSystem = FileSystem; + Item->FileSystemName = FileSystemName; Item->FormatFunc = FormatFunc; Item->ChkdskFunc = ChkdskFunc; Item->QuickFormat = TRUE; @@ -58,7 +58,7 @@ if (!Item) return; - Item->FileSystem = FileSystem; + Item->FileSystemName = FileSystemName; Item->FormatFunc = FormatFunc; Item->ChkdskFunc = ChkdskFunc; Item->QuickFormat = FALSE; @@ -99,7 +99,7 @@ while (ListEntry != &List->ListHead) { Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); - if (Item->FileSystem && wcscmp(ForceFileSystem, Item->FileSystem) == 0) + if (Item->FileSystemName && wcscmp(ForceFileSystem, Item->FileSystemName) == 0) { List->Selected = Item; break; @@ -163,12 +163,12 @@ coPos, &Written); - if (Item->FileSystem) + if (Item->FileSystemName) { if (Item->QuickFormat) - snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK1), Item->FileSystem); + snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK1), Item->FileSystemName); else - snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK2), Item->FileSystem); + snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_FORMATDISK2), Item->FileSystemName); } else snprintf(Buffer, sizeof(Buffer), MUIGetString(STRING_KEEPFORMAT)); @@ -210,4 +210,26 @@ } } + +PFILE_SYSTEM_ITEM +GetFileSystemByName( + IN PFILE_SYSTEM_LIST List, + IN LPWSTR FileSystemName) +{ + PLIST_ENTRY ListEntry; + PFILE_SYSTEM_ITEM Item; + + ListEntry = List->ListHead.Flink; + while (ListEntry != &List->ListHead) + { + Item = CONTAINING_RECORD(ListEntry, FILE_SYSTEM_ITEM, ListEntry); + if (Item->FileSystemName && wcsicmp(FileSystemName, Item->FileSystemName) == 0) + return Item; + + ListEntry = ListEntry->Flink; + } + + return NULL; +} + /* EOF */ Modified: trunk/reactos/base/setup/usetup/fslist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/fslist.h… ============================================================================== --- trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/fslist.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -31,7 +31,7 @@ typedef struct _FILE_SYSTEM_ITEM { LIST_ENTRY ListEntry; - LPCWSTR FileSystem; /* Not owned by the item */ + LPCWSTR FileSystemName; /* Not owned by the item */ FORMATEX FormatFunc; CHKDSKEX ChkdskFunc; BOOLEAN QuickFormat; @@ -48,7 +48,7 @@ VOID FS_AddProvider( IN OUT PFILE_SYSTEM_LIST List, - IN LPCWSTR FileSystem, + IN LPCWSTR FileSystemName, IN FORMATEX FormatFunc, IN CHKDSKEX ChkdskFunc); @@ -75,4 +75,9 @@ ScrollUpFileSystemList( IN PFILE_SYSTEM_LIST List); +PFILE_SYSTEM_ITEM +GetFileSystemByName( + IN PFILE_SYSTEM_LIST List, + IN LPWSTR FileSystemName); + /* EOF */ 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 [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -2418,6 +2418,8 @@ PCHAR PartUnit; PCHAR PartType; + DPRINT("SelectFileSystemPage()\n"); + if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || PartitionList->CurrentPartition == NULL) @@ -2426,8 +2428,90 @@ return QUIT_PAGE; } - DiskEntry = PartitionList->CurrentDisk; - PartEntry = PartitionList->CurrentPartition; + /* Find or set the active partition */ + CheckActiveBootPartition(PartitionList); + + if (PartitionList->BootDisk == NULL || + PartitionList->BootPartition == NULL) + { + /* FIXME: show an error dialog */ + return QUIT_PAGE; + } + + switch (PartitionList->FormatState) + { + case Start: + if (PartitionList->CurrentPartition != PartitionList->BootPartition) + { + PartitionList->TempDisk = PartitionList->BootDisk; + PartitionList->TempPartition = PartitionList->BootPartition; + PartitionList->TempPartition->NeedsCheck = TRUE; + + PartitionList->FormatState = FormatSystemPartition; + DPRINT1("FormatState: Start --> FormatSystemPartition\n"); + } + else + { + PartitionList->TempDisk = PartitionList->CurrentDisk; + PartitionList->TempPartition = PartitionList->CurrentPartition; + PartitionList->TempPartition->NeedsCheck = TRUE; + + PartitionList->FormatState = FormatInstallPartition; + DPRINT1("FormatState: Start --> FormatInstallPartition\n"); + } + break; + + case FormatSystemPartition: + PartitionList->TempDisk = PartitionList->CurrentDisk; + PartitionList->TempPartition = PartitionList->CurrentPartition; + PartitionList->TempPartition->NeedsCheck = TRUE; + + PartitionList->FormatState = FormatInstallPartition; + DPRINT1("FormatState: FormatSystemPartition --> FormatInstallPartition\n"); + break; + + case FormatInstallPartition: + if (GetNextUnformattedPartition(PartitionList, + &PartitionList->TempDisk, + &PartitionList->TempPartition)) + { + PartitionList->FormatState = FormatOtherPartition; + PartitionList->TempPartition->NeedsCheck = TRUE; + DPRINT1("FormatState: FormatInstallPartition --> FormatOtherPartition\n"); + } + else + { + PartitionList->FormatState = FormatDone; + DPRINT1("FormatState: FormatInstallPartition --> FormatDone\n"); + return CHECK_FILE_SYSTEM_PAGE; + } + break; + + case FormatOtherPartition: + if (GetNextUnformattedPartition(PartitionList, + &PartitionList->TempDisk, + &PartitionList->TempPartition)) + { + PartitionList->FormatState = FormatOtherPartition; + PartitionList->TempPartition->NeedsCheck = TRUE; + DPRINT1("FormatState: FormatOtherPartition --> FormatOtherPartition\n"); + } + else + { + PartitionList->FormatState = FormatDone; + DPRINT1("FormatState: FormatOtherPartition --> FormatDone\n"); + return CHECK_FILE_SYSTEM_PAGE; + } + break; + + default: + DPRINT1("FormatState: Invalid value %ld\n", PartitionList->FormatState); + /* FIXME: show an error dialog */ + return QUIT_PAGE; + } + + DiskEntry = PartitionList->TempDisk; + PartEntry = PartitionList->TempPartition; /* adjust disk size */ DiskSize = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; @@ -2513,7 +2597,24 @@ } else if (PartEntry->New == TRUE) { - CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDPART)); + switch (PartitionList->FormatState) + { + case FormatSystemPartition: + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDSYSTEMPART)); + break; + + case FormatInstallPartition: + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDPART)); + break; + + case FormatOtherPartition: + CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_NONFORMATTEDOTHERPART)); + break; + + default: + break; + } + CONSOLE_SetTextXY(6, 10, MUIGetString(STRING_PARTFORMAT)); } else @@ -2577,6 +2678,8 @@ { if (UnattendFormatPartition) { + PartEntry->FileSystem = GetFileSystemByName(FileSystemList, + L"FAT"); return FORMAT_PARTITION_PAGE; } @@ -2616,10 +2719,11 @@ { if (!FileSystemList->Selected->FormatFunc) { - return CHECK_FILE_SYSTEM_PAGE; + return SELECT_FILE_SYSTEM_PAGE; } else { + PartEntry->FileSystem = FileSystemList->Selected; return FORMAT_PARTITION_PAGE; } } @@ -2632,6 +2736,7 @@ static ULONG FormatPartitionPage(PINPUT_RECORD Ir) { + UNICODE_STRING PartitionRootPath; WCHAR PathBuffer[MAX_PATH]; PDISKENTRY DiskEntry; PPARTENTRY PartEntry; @@ -2643,18 +2748,20 @@ PLIST_ENTRY Entry; #endif + DPRINT("FormatPartitionPage()\n"); + MUIDisplayPage(FORMAT_PARTITION_PAGE); if (PartitionList == NULL || - PartitionList->CurrentDisk == NULL || - PartitionList->CurrentPartition == NULL) + PartitionList->TempDisk == NULL || + PartitionList->TempPartition == NULL) { /* FIXME: show an error dialog */ return QUIT_PAGE; } - DiskEntry = PartitionList->CurrentDisk; - PartEntry = PartitionList->CurrentPartition; + DiskEntry = PartitionList->TempDisk; + PartEntry = PartitionList->TempPartition; while (TRUE) { @@ -2677,7 +2784,7 @@ { CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - if (wcscmp(FileSystemList->Selected->FileSystem, L"FAT") == 0) + if (wcscmp(PartEntry->FileSystem->FileSystemName, L"FAT") == 0) { if (PartEntry->SectorCount.QuadPart < 8192) { @@ -2720,17 +2827,24 @@ } } + DiskEntry->Dirty = TRUE; DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; + DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; } #if 0 - else if (wcscmp(FileSystemList->Selected->FileSystem, L"EXT2") == 0) + else if (wcscmp(PartEntry->FileSystem->FileSystemName, L"EXT2") == 0) { PartEntry->PartitionType = PARTITION_EXT2; + + DiskEntry->Dirty = TRUE; DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].PartitionType = PartEntry->PartitionType; + DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex].RewritePartition = TRUE; } #endif - else if (!FileSystemList->Selected->FormatFunc) + else if (!PartEntry->FileSystem->FormatFunc) + { return QUIT_PAGE; + } #ifndef NDEBUG CONSOLE_PrintTextXY(6, 12, @@ -2740,7 +2854,7 @@ DiskEntry->TrackSize); Line = 13; - DiskEntry = PartitionList->CurrentDisk; + DiskEntry = PartitionList->TempDisk; Entry = DiskEntry->PartListHead.Flink; while (Entry != &DiskEntry->PrimaryPartListHead) @@ -2765,10 +2879,8 @@ } /* Restore the old entry */ - PartEntry = PartitionList->CurrentPartition; + PartEntry = PartitionList->TempPartition; #endif - - CheckActiveBootPartition(PartitionList); if (WritePartitionsToDisk(PartitionList) == FALSE) { @@ -2777,20 +2889,19 @@ return QUIT_PAGE; } - /* Set DestinationRootPath */ - RtlFreeUnicodeString(&DestinationRootPath); + /* Set PartitionRootPath */ swprintf(PathBuffer, L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->CurrentDisk->DiskNumber, - PartitionList->CurrentPartition->PartitionNumber); - RtlCreateUnicodeString(&DestinationRootPath, - PathBuffer); - DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); - - if (FileSystemList->Selected->FormatFunc) - { - Status = FormatPartition(&DestinationRootPath, - FileSystemList->Selected); + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlInitUnicodeString(&PartitionRootPath, + PathBuffer); + DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); + + if (PartEntry->FileSystem->FormatFunc) + { + Status = FormatPartition(&PartitionRootPath, + PartEntry->FileSystem); if (!NT_SUCCESS(Status)) { DPRINT1("FormatPartition() failed with status 0x%08lx\n", Status); @@ -2799,7 +2910,6 @@ } PartEntry->New = FALSE; - } #ifndef NDEBUG @@ -2807,9 +2917,7 @@ CONSOLE_ConInKey(Ir); #endif - DestroyFileSystemList(FileSystemList); - FileSystemList = NULL; - return INSTALL_DIRECTORY_PAGE; + return SELECT_FILE_SYSTEM_PAGE; } } @@ -2821,35 +2929,76 @@ CheckFileSystemPage(PINPUT_RECORD Ir) { PFILE_SYSTEM_ITEM CurrentFileSystem; + UNICODE_STRING PartitionRootPath; WCHAR PathBuffer[MAX_PATH]; CHAR Buffer[MAX_PATH]; + LPWSTR FileSystemName = NULL; + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; NTSTATUS Status; - /* FIXME: code duplicated in FormatPartitionPage */ - /* Set DestinationRootPath */ - RtlFreeUnicodeString(&DestinationRootPath); + if (PartitionList == NULL) + { + /* FIXME: show an error dialog */ + return QUIT_PAGE; + } + + if (!GetNextUncheckedPartition(PartitionList, + &DiskEntry, + &PartEntry)) + { + return INSTALL_DIRECTORY_PAGE; + } + + /* Set PartitionRootPath */ swprintf(PathBuffer, L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->CurrentDisk->DiskNumber, - PartitionList->CurrentPartition->PartitionNumber); - RtlCreateUnicodeString(&DestinationRootPath, PathBuffer); - DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlInitUnicodeString(&PartitionRootPath, PathBuffer); + DPRINT("PartitionRootPath: %wZ\n", &PartitionRootPath); CONSOLE_SetTextXY(6, 8, MUIGetString(STRING_CHECKINGPART)); CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - /* WRONG: first filesystem is not necesseraly the one of the current partition! */ - CurrentFileSystem = CONTAINING_RECORD(FileSystemList->ListHead.Flink, FILE_SYSTEM_ITEM, ListEntry); - - if (!CurrentFileSystem->ChkdskFunc) + CurrentFileSystem = PartEntry->FileSystem; + if (CurrentFileSystem->FileSystemName == NULL) + { + if ((PartEntry->PartitionType == PARTITION_FAT_12) || + (PartEntry->PartitionType == PARTITION_FAT_16) || + (PartEntry->PartitionType == PARTITION_HUGE) || + (PartEntry->PartitionType == PARTITION_XINT13)) + { + FileSystemName = L"FAT"; + } + else if ((PartEntry->PartitionType == PARTITION_FAT32) || + (PartEntry->PartitionType == PARTITION_FAT32_XINT13)) + { + FileSystemName = L"FAT32"; + } + else if (PartEntry->PartitionType == PARTITION_EXT2) + { + FileSystemName = L"EXT2"; + } + else if (PartEntry->PartitionType == PARTITION_IFS) + { + FileSystemName = L"NTFS"; /* FIXME: Not quite correct! */ + } + + if (FileSystemName != NULL) + CurrentFileSystem = GetFileSystemByName(FileSystemList, + FileSystemName); + } + + if (CurrentFileSystem == NULL || CurrentFileSystem->ChkdskFunc == NULL) { sprintf(Buffer, "Setup is currently unable to check a partition formatted in %S.\n" "\n" " \x07 Press ENTER to continue Setup.\n" " \x07 Press F3 to quit Setup.", - CurrentFileSystem->FileSystem); + CurrentFileSystem->FileSystemName); PopupError(Buffer, MUIGetString(STRING_QUITCONTINUE), @@ -2869,13 +3018,14 @@ } else if (Ir->Event.KeyEvent.uChar.AsciiChar == VK_RETURN) /* ENTER */ { - return INSTALL_DIRECTORY_PAGE; + PartEntry->NeedsCheck = FALSE; + return CHECK_FILE_SYSTEM_PAGE; } } } else { - Status = ChkdskPartition(&DestinationRootPath, CurrentFileSystem); + Status = ChkdskPartition(&PartitionRootPath, CurrentFileSystem); if (!NT_SUCCESS(Status)) { DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status); @@ -2889,7 +3039,8 @@ return QUIT_PAGE; } - return INSTALL_DIRECTORY_PAGE; + PartEntry->NeedsCheck = FALSE; + return CHECK_FILE_SYSTEM_PAGE; } } @@ -2905,6 +3056,15 @@ RtlFreeUnicodeString(&InstallPath); RtlCreateUnicodeString(&InstallPath, InstallDir); + + /* Create 'DestinationRootPath' string */ + RtlFreeUnicodeString(&DestinationRootPath); + swprintf(PathBuffer, + L"\\Device\\Harddisk%lu\\Partition%lu", + DiskEntry->DiskNumber, + PartEntry->PartitionNumber); + RtlCreateUnicodeString(&DestinationRootPath, PathBuffer); + DPRINT("DestinationRootPath: %wZ\n", &DestinationRootPath); /* Create 'DestinationPath' string */ RtlFreeUnicodeString(&DestinationPath); @@ -2940,6 +3100,10 @@ PPARTENTRY PartEntry; WCHAR InstallDir[51]; ULONG Length; + + /* We do not need the filsystem list any more */ + DestroyFileSystemList(FileSystemList); + FileSystemList = NULL; if (PartitionList == NULL || PartitionList->CurrentDisk == NULL || @@ -3760,27 +3924,16 @@ CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT)); - /* Find or set the active partition */ - CheckActiveBootPartition(PartitionList); - - /* Update the partition table because we may have changed the active partition */ - if (WritePartitionsToDisk(PartitionList) == FALSE) - { - DPRINT("WritePartitionsToDisk() failed\n"); - MUIDisplayError(ERROR_WRITE_PTABLE, Ir, POPUP_WAIT_ENTER); - return QUIT_PAGE; - } - RtlFreeUnicodeString(&SystemRootPath); swprintf(PathBuffer, L"\\Device\\Harddisk%lu\\Partition%lu", - PartitionList->ActiveBootDisk->DiskNumber, - PartitionList->ActiveBootPartition->PartitionNumber); + PartitionList->BootDisk->DiskNumber, + PartitionList->BootPartition->PartitionNumber); RtlCreateUnicodeString(&SystemRootPath, PathBuffer); DPRINT("SystemRootPath: %wZ\n", &SystemRootPath); - PartitionType = PartitionList->ActiveBootPartition->PartitionType; + PartitionType = PartitionList->BootPartition->PartitionType; if (IsUnattendedSetup) { @@ -3958,13 +4111,14 @@ return BOOT_LOADER_FLOPPY_PAGE; } + static PAGE_NUMBER BootLoaderHarddiskVbrPage(PINPUT_RECORD Ir) { UCHAR PartitionType; NTSTATUS Status; - PartitionType = PartitionList->ActiveBootPartition->PartitionType; + PartitionType = PartitionList->BootPartition->PartitionType; Status = InstallVBRToPartition(&SystemRootPath, &SourceRootPath, @@ -3979,6 +4133,7 @@ return SUCCESS_PAGE; } + static PAGE_NUMBER BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) { @@ -3988,7 +4143,7 @@ WCHAR SourceMbrPathBuffer[MAX_PATH]; /* Step 1: Write the VBR */ - PartitionType = PartitionList->ActiveBootPartition->PartitionType; + PartitionType = PartitionList->BootPartition->PartitionType; Status = InstallVBRToPartition(&SystemRootPath, &SourceRootPath, @@ -4003,7 +4158,7 @@ /* Step 2: Write the MBR */ swprintf(DestinationDevicePathBuffer, L"\\Device\\Harddisk%d\\Partition0", - PartitionList->ActiveBootDisk->DiskNumber); + PartitionList->BootDisk->DiskNumber); wcscpy(SourceMbrPathBuffer, SourceRootPath.Buffer); wcscat(SourceMbrPathBuffer, L"\\loader\\dosmbr.bin"); Modified: trunk/reactos/base/setup/usetup/lang/bg-BG.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bg-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bg-BG.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1669,6 +1669,10 @@ "à¥¤áâ®¨ ä®à¬ â¨à ¥ ¤ï« ."}, {STRING_NONFORMATTEDPART, "§¡à «¨ áâ¥ ¤ á«®¦¨â¥ ¥ ªâ ®¢ ¨«¨ ¥à §¯à¥¤¥«¥ ¤ï«."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "« £ ¥ ¥ ªâ ¢êàåã ¤ï«"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/bn-BD.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/bn-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/bn-BD.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1653,6 +1653,10 @@ "This Partition will be formatted next."}, {STRING_NONFORMATTEDPART, "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/cs-CZ.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/cs-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/cs-CZ.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1662,6 +1662,10 @@ "Tento odd¡l bude zform tov n."}, {STRING_NONFORMATTEDPART, "Zvolili jste instalaci ReactOS na novì nebo nezform tovanì odd¡l."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Instalace nakop¡ruje ReactOS na odd¡l"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/de-DE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/de-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/de-DE.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1658,6 +1658,10 @@ "Diese Partition wird als nchstes formatiert."}, {STRING_NONFORMATTEDPART, "Sie wollen ReactOS auf einer neuen/unformatierten Partition installieren."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "ReactOS wird auf dieser Partition installiert."}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/el-GR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/el-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/el-GR.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1679,6 +1679,10 @@ "¬«æ «¦ Partition £¦¨àå £«á."}, {STRING_NONFORMATTEDPART, "§ ¢â¥« ¤ ¡«©«ã©« «¦ ReactOS © â¤ ¤â¦ ã £ £¦¨à£â¤¦ Partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup install ReactOS onto Partition"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/en-US.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/en-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/en-US.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1653,6 +1653,10 @@ "This Partition will be formatted next."}, {STRING_NONFORMATTEDPART, "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/es-ES.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/es-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/es-ES.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1661,6 +1661,10 @@ "A continuaci¢n se formatear esta partici¢n."}, {STRING_NONFORMATTEDPART, "Ha elegido instalar ReactOS en una nueva partici¢n o en una partici¢n sin formato."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "El instalador est instalando ReactOS en la partici¢n"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/et-EE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/et-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/et-EE.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1654,6 +1654,10 @@ "Jrgmisena vormindatakse seda partitsiooni."}, {STRING_NONFORMATTEDPART, "Oled valinud ReactOSi paigaldamise uuele väi vormindamata partitsioonile."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "ReactOS paigaldatakse partitsioonile"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/fr-FR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/fr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/fr-FR.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1667,6 +1667,10 @@ "Cette Partition sera ensuite formate."}, {STRING_NONFORMATTEDPART, "Vous avez choisi d'installer ReactOS sur une nouvelle partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installe ReactOS sur la partition"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/he-IL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/he-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/he-IL.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1655,6 +1655,10 @@ "This Partition will be formatted next."}, {STRING_NONFORMATTEDPART, "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1658,6 +1658,10 @@ "Questa partizione sar formattata successivamente."}, {STRING_NONFORMATTEDPART, "Avete scelto di installare ReactOS su una partizione nuova o non formattata."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installer ReactOS sulla partitione"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/ja-JP.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ja-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ja-JP.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1657,6 +1657,10 @@ "ºÉ Êß°Ã¨¼®ÝÊ Â·ÞÉ Ã¼ÞÝÃÞ Ì«°Ï¯Ä »ÚÏ½¡"}, {STRING_NONFORMATTEDPART, "ReactOS¦ ¼Ý· ÏÀÊ ÐÌ«°Ï¯ÄÉ Êß°Ã¨¼®ÝÆ ²Ý½Ä°Ù½Ù ºÄ¶Þ ¾ÝÀ¸ »ÚÏ¼À¡"}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "¾¯Ä±¯ÌßÊ ReactOS¦ Êß°Ã¨¼®Ý ¼Þ®³Æ ²Ý½Ä°Ù¼Ï½¡"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/lt-LT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/lt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/lt-LT.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1664,6 +1664,10 @@ "This Partition will be formatted next."}, {STRING_NONFORMATTEDPART, "You chose to install ReactOS on a new or unformatted Partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installs ReactOS onto Partition"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/nl-NL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/nl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/nl-NL.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1702,6 +1702,10 @@ "Deze partitie zal vervolgens geformatteerd worden."}, {STRING_NONFORMATTEDPART, "U wilt ReactOS installeren op een nieuwe of ongeformatteerde partitie."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installeert ReactOS op Partitie"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/pl-PL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pl-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pl-PL.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1664,6 +1664,10 @@ "Nast©puj¥ca partycja zostanie sformatowana."}, {STRING_NONFORMATTEDPART, "Mo¾esz zainstalowa ReactOS na nowej lub niesformatowanej partycji."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Instalator kopiuje pliki systemu na wybran¥ partycj©."}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/pt-BR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/pt-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/pt-BR.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1693,6 +1693,10 @@ "Esta partiÆo ser formatada logo em seguida."}, {STRING_NONFORMATTEDPART, "Voc solicitou instalar o ReactOS em uma partiÆo nova ou sem formato."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "O instalador instala o ReactOS na partiÆo"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ro-RO.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1730,6 +1730,10 @@ "AceastÇ partiîie urmeazÇ sÇ fie formatatÇ."}, {STRING_NONFORMATTEDPART, "Alegeîi sÇ instalaîi ReactOS pe partiîie nouÇ sau neformatatÇ."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "ReactOS va fi instalat pe partiîia"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/ru-RU.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ru-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/ru-RU.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1655,6 +1655,10 @@ "â®â à §¤¥« ¡ã¤¥â ®âä®à¬ â¨à®¢ ¤ «¥¥."}, {STRING_NONFORMATTEDPART, "ë ¢ë¡à «¨ ãáâ ®¢ªã ReactOS ®¢ë© ¥®âä®à¬ â¨à®¢ ë© à §¤¥«."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "ReactOS ãáâ ¢«¨¢ ¥âáï à §¤¥«:"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/sk-SK.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sk-SK.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1668,6 +1668,10 @@ "T to oblas sa bude form tova ako Ôalçia."}, {STRING_NONFORMATTEDPART, "Zvolili ste inçtal ciu systmu ReactOS na nov£ alebo nenaform tovan£ oblas."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Inçtal tor nainçtaluje systm ReactOS na oblas"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/sq-AL.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sq-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sq-AL.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1660,6 +1660,10 @@ "Ky particion do t formatohet tani."}, {STRING_NONFORMATTEDPART, "Ju zgjodht ReactOS pr tu instaluar n nj particion t'ri t paformatuar."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Instalimi i ReactOS ne Particion"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/sv-SE.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/sv-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/sv-SE.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1663,6 +1663,10 @@ "Denna Partition kommer att bli formaterad hrnst."}, {STRING_NONFORMATTEDPART, "Du valde att installera ReactOS p en oformaterad partition."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Setup installerar ReactOS till Partitionen"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/tr-TR.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/tr-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/tr-TR.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1641,6 +1641,10 @@ "Bu blm ileride biimlendirilecektir."}, {STRING_NONFORMATTEDPART, "ReactOS'u yeni ya da biimlendirilmemi bir blme kurmay setiniz."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "Kur, ReactOS'u blm zerine kurar."}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/lang/uk-UA.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/uk-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/uk-UA.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -1663,6 +1663,10 @@ "¥© à®§¤i« ¡ã¤¥ ¢i¤ä®à¬ â®¢ ®."}, {STRING_NONFORMATTEDPART, "¨ ¢¨¡à «¨ ¢áâ ®¢«¥ï ReactOS ®¢¨© ¡® ¥ä®à¬ â®¢ ¨© à®§¤i«."}, + {STRING_NONFORMATTEDSYSTEMPART, + "The system partition is not formatted yet."}, + {STRING_NONFORMATTEDOTHERPART, + "The new partition is not formatted yet."}, {STRING_INSTALLONPART, "ReactOS ¢áâ ®¢«îóâìáï à®§¤i«"}, {STRING_CHECKINGPART, Modified: trunk/reactos/base/setup/usetup/mui.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/mui.h?re… ============================================================================== --- trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/mui.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -111,6 +111,8 @@ #define STRING_CREATEPARTITION 7 #define STRING_PARTFORMAT 8 #define STRING_NONFORMATTEDPART 9 +#define STRING_NONFORMATTEDSYSTEMPART 62 +#define STRING_NONFORMATTEDOTHERPART 63 #define STRING_INSTALLONPART 10 #define STRING_CHECKINGPART 11 #define STRING_QUITCONTINUE 12 Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.c [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -31,7 +31,7 @@ #define NDEBUG #include <debug.h> -#define DUMP_PARTITION_TABLE +//#define DUMP_PARTITION_TABLE /* FUNCTIONS ****************************************************************/ @@ -47,7 +47,7 @@ for (i = 0; i < DiskEntry->LayoutBuffer->PartitionCount; i++) { PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[i]; - DPRINT("\n%lu: %12I64u %12I64u %10lu %2lu %2x %c %c\n", + DPRINT1("\n%lu: %12I64u %12I64u %10lu %2lu %2x %c %c\n", i, PartitionInfo->StartingOffset.QuadPart, PartitionInfo->PartitionLength.QuadPart, @@ -1273,6 +1273,13 @@ List->CurrentDisk = NULL; List->CurrentPartition = NULL; + + List->BootDisk = NULL; + List->BootPartition = NULL; + + List->TempDisk = NULL; + List->TempPartition = NULL; + List->FormatState = Start; InitializeListHead(&List->DiskListHead); InitializeListHead(&List->BiosDiskListHead); @@ -2739,14 +2746,14 @@ /* Check for empty disk list */ if (IsListEmpty (&List->DiskListHead)) { - List->ActiveBootDisk = NULL; - List->ActiveBootPartition = NULL; + List->BootDisk = NULL; + List->BootPartition = NULL; return; } #if 0 - if (List->ActiveBootDisk != NULL && - List->ActiveBootPartition != NULL) + if (List->BootDisk != NULL && + List->BootPartition != NULL) { /* We already have an active boot partition */ return; @@ -2759,8 +2766,8 @@ /* Check for empty partition list */ if (IsListEmpty (&DiskEntry->PrimaryPartListHead)) { - List->ActiveBootDisk = NULL; - List->ActiveBootPartition = NULL; + List->BootDisk = NULL; + List->BootPartition = NULL; return; } @@ -2778,15 +2785,15 @@ DiskEntry->Dirty = TRUE; /* FIXME: Might be incorrect if partitions were created by Linux FDISK */ - List->ActiveBootDisk = DiskEntry; - List->ActiveBootPartition = PartEntry; + List->BootDisk = DiskEntry; + List->BootPartition = PartEntry; return; } /* Disk is not new, scan all partitions to find a bootable one */ - List->ActiveBootDisk = NULL; - List->ActiveBootPartition = NULL; + List->BootDisk = NULL; + List->BootPartition = NULL; ListEntry = DiskEntry->PrimaryPartListHead.Flink; while (ListEntry != &DiskEntry->PrimaryPartListHead) @@ -2802,8 +2809,8 @@ PartEntry->BootIndicator) { /* Yes, we found it */ - List->ActiveBootDisk = DiskEntry; - List->ActiveBootPartition = PartEntry; + List->BootDisk = DiskEntry; + List->BootPartition = PartEntry; DPRINT("Found bootable partition disk %d, drive letter %c\n", DiskEntry->DiskNumber, PartEntry->DriveLetter); @@ -3104,4 +3111,114 @@ return ERROR_SUCCESS; } + +BOOL +GetNextUnformattedPartition( + IN PPARTLIST List, + OUT PDISKENTRY *pDiskEntry, + OUT PPARTENTRY *pPartEntry) +{ + PLIST_ENTRY Entry1, Entry2; + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; + + Entry1 = List->DiskListHead.Flink; + while (Entry1 != &List->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry1, + DISKENTRY, + ListEntry); + + Entry2 = DiskEntry->PrimaryPartListHead.Flink; + while (Entry2 != &DiskEntry->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned && PartEntry->New) + { + *pDiskEntry = DiskEntry; + *pPartEntry = PartEntry; + return TRUE; + } + + Entry2 = Entry2->Flink; + } + + Entry2 = DiskEntry->LogicalPartListHead.Flink; + while (Entry2 != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (PartEntry->IsPartitioned && PartEntry->New) + { + *pDiskEntry = DiskEntry; + *pPartEntry = PartEntry; + return TRUE; + } + + Entry2 = Entry2->Flink; + } + + Entry1 = Entry1->Flink; + } + + *pDiskEntry = NULL; + *pPartEntry = NULL; + + return FALSE; +} + + +BOOL +GetNextUncheckedPartition( + IN PPARTLIST List, + OUT PDISKENTRY *pDiskEntry, + OUT PPARTENTRY *pPartEntry) +{ + PLIST_ENTRY Entry1, Entry2; + PDISKENTRY DiskEntry; + PPARTENTRY PartEntry; + + Entry1 = List->DiskListHead.Flink; + while (Entry1 != &List->DiskListHead) + { + DiskEntry = CONTAINING_RECORD(Entry1, + DISKENTRY, + ListEntry); + + Entry2 = DiskEntry->PrimaryPartListHead.Flink; + while (Entry2 != &DiskEntry->PrimaryPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (PartEntry->NeedsCheck == TRUE) + { + *pDiskEntry = DiskEntry; + *pPartEntry = PartEntry; + return TRUE; + } + + Entry2 = Entry2->Flink; + } + + Entry2 = DiskEntry->LogicalPartListHead.Flink; + while (Entry2 != &DiskEntry->LogicalPartListHead) + { + PartEntry = CONTAINING_RECORD(Entry2, PARTENTRY, ListEntry); + if (PartEntry->NeedsCheck == TRUE) + { + *pDiskEntry = DiskEntry; + *pPartEntry = PartEntry; + return TRUE; + } + + Entry2 = Entry2->Flink; + } + + Entry1 = Entry1->Flink; + } + + *pDiskEntry = NULL; + *pPartEntry = NULL; + + return FALSE; +} + /* EOF */ Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/partlist.h [iso-8859-1] Fri Jun 12 21:51:57 2015 @@ -37,6 +37,18 @@ Formatted } FORMATSTATE, *PFORMATSTATE; +typedef enum _FORMATMACHINESTATE +{ + Start, + FormatSystemPartition, + FormatInstallPartition, + FormatOtherPartition, + FormatDone, + CheckSystemPartition, + CheckInstallPartition, + CheckOtherPartition, + CheckDone +} FORMATMACHINESTATE, *PFORMATMACHINESTATE; typedef struct _PARTENTRY { @@ -70,6 +82,10 @@ FORMATSTATE FormatState; + /* Partition must be checked */ + BOOLEAN NeedsCheck; + + struct _FILE_SYSTEM_ITEM *FileSystem; } PARTENTRY, *PPARTENTRY; @@ -141,8 +157,12 @@ PDISKENTRY CurrentDisk; PPARTENTRY CurrentPartition; - PDISKENTRY ActiveBootDisk; - PPARTENTRY ActiveBootPartition; + PDISKENTRY BootDisk; + PPARTENTRY BootPartition; + + PDISKENTRY TempDisk; + PPARTENTRY TempPartition; + FORMATMACHINESTATE FormatState; LIST_ENTRY DiskListHead; LIST_ENTRY BiosDiskListHead; @@ -263,4 +283,16 @@ LogicalPartitionCreationChecks( IN PPARTLIST List); +BOOL +GetNextUnformattedPartition( + IN PPARTLIST List, + OUT PDISKENTRY *pDiskEntry, + OUT PPARTENTRY *pPartEntry); + +BOOL +GetNextUncheckedPartition( + IN PPARTLIST List, + OUT PDISKENTRY *pDiskEntry, + OUT PPARTENTRY *pPartEntry); + /* EOF */

9 years, 4 months

[akhaldi] 68111: [COMCTL32][EXPLORER][UXTHEME] Properly draw the taskbar rebar when themes are enabled. Brought to you by Stefano Toncich aka Tonix. CORE-8901

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Fri Jun 12 19:11:48 2015 New Revision: 68111 URL: http://svn.reactos.org/svn/reactos?rev=68111&view=rev Log: [COMCTL32][EXPLORER][UXTHEME] Properly draw the taskbar rebar when themes are enabled. Brought to you by Stefano Toncich aka Tonix. CORE-8901 Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/explorer/traywnd.cpp trunk/reactos/dll/win32/comctl32/rebar.c trunk/reactos/dll/win32/uxtheme/draw.c trunk/reactos/dll/win32/uxtheme/msstyles.c Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… ============================================================================== --- trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/trayntfy.cpp [iso-8859-1] Fri Jun 12 19:11:48 2015 @@ -1447,6 +1447,7 @@ LRESULT DrawBackground(HDC hdc) { + HRESULT res; RECT rect; GetClientRect(&rect); @@ -1458,10 +1459,10 @@ DrawThemeParentBackground(m_hWnd, hdc, &rect); } - DrawThemeBackground(TrayTheme, hdc, TNP_BACKGROUND, 0, &rect, 0); - } - - return TRUE; + res = DrawThemeBackground(TrayTheme, hdc, TNP_BACKGROUND, 0, &rect, 0); + } + + return res; } LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… ============================================================================== --- trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/traywnd.cpp [iso-8859-1] Fri Jun 12 19:11:48 2015 @@ -1838,6 +1838,7 @@ { RECT rect; int partId; + HRESULT res; GetClientRect(&rect); @@ -1860,11 +1861,10 @@ partId = TBP_BACKGROUNDBOTTOM; break; } - - DrawThemeBackground(m_Theme, hdc, partId, 0, &rect, 0); - } - - return TRUE; + res = DrawThemeBackground(m_Theme, hdc, partId, 0, &rect, 0); + } + + return res; } LRESULT OnEraseBackground(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) @@ -1911,7 +1911,10 @@ rect.bottom = rect.top + GetSystemMetrics(SM_CYSIZEFRAME); break; } - + if (IsThemeBackgroundPartiallyTransparent(m_Theme, backoundPart, 0)) + { + DrawThemeParentBackground(m_hWnd, hdc, &rect); + } DrawThemeBackground(m_Theme, hdc, backoundPart, 0, &rect, 0); ReleaseDC(m_hWnd, hdc); Modified: trunk/reactos/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c… ============================================================================== --- trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comctl32/rebar.c [iso-8859-1] Fri Jun 12 19:11:48 2015 @@ -1831,6 +1831,17 @@ HRGN hrgn; GetClientRect (infoPtr->hwndSelf, &cr); + +#ifdef __REACTOS__ + if (theme) + { + if (IsThemeBackgroundPartiallyTransparent(theme, RP_BACKGROUND, 0)) + { + DrawThemeParentBackground (infoPtr->hwndSelf, hdc, &cr); + } + DrawThemeBackground (theme, hdc, 0, 0, &cr, NULL); + } +#endif hrgn = CreateRectRgn(cr.left, cr.top, cr.right, cr.bottom); oldrow = -1; @@ -1921,6 +1932,9 @@ #endif } +#ifdef __REACTOS__ + if (!theme) +#else if (theme) { /* When themed, the background color is ignored (but not a @@ -1928,6 +1942,7 @@ DrawThemeBackground (theme, hdc, 0, 0, &cr, &rcBand); } else +#endif { old = SetBkColor (hdc, new); TRACE("%s background color=0x%06x, band %s\n", @@ -1945,6 +1960,9 @@ } #if 1 +#ifdef __REACTOS__ + if (!theme) +#endif { //FIXME: Apparently painting the remaining area is a v6 feature HBRUSH hbrush = CreateSolidBrush(new); @@ -3243,7 +3261,11 @@ else if ((theme = GetWindowTheme (infoPtr->hwndSelf))) { /* FIXME: should use GetThemeInt */ +#ifdef __REACTOS__ + rect->top = (rect->top + 1 < rect->bottom) ? rect->top : rect->bottom; +#else rect->top = min(rect->top + 1, rect->bottom); +#endif } TRACE("new client=(%s)\n", wine_dbgstr_rect(rect)); return 0; Modified: trunk/reactos/dll/win32/uxtheme/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/draw.c?r… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/draw.c [iso-8859-1] Fri Jun 12 19:11:48 2015 @@ -2087,6 +2087,9 @@ GetThemeEnumValue(hTheme, iPartId, iStateId, TMT_BGTYPE, &bgtype); +#ifdef __REACTOS__ + if (bgtype == BT_NONE) return TRUE; +#endif if (bgtype != BT_IMAGEFILE) return FALSE; if(FAILED (UXTHEME_LoadImage (hTheme, 0, iPartId, iStateId, &rect, FALSE, Modified: trunk/reactos/dll/win32/uxtheme/msstyles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/msstyles… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/msstyles.c [iso-8859-1] Fri Jun 12 19:11:48 2015 @@ -763,6 +763,9 @@ PTHEME_CLASS MSSTYLES_OpenThemeClass(PTHEME_FILE tf, LPCWSTR pszAppName, LPCWSTR pszClassList) { PTHEME_CLASS cls = NULL; +#ifdef __REACTOS__ + PTHEME_CLASS defaultCls = NULL; +#endif WCHAR szClassName[MAX_THEME_CLASS_NAME]; LPCWSTR start; LPCWSTR end; @@ -779,10 +782,18 @@ start = end+1; cls = MSSTYLES_FindClass(tf, pszAppName, szClassName); if(cls) break; +#ifdef __REACTOS__ + if (!defaultCls) + defaultCls = MSSTYLES_FindClass(tf, NULL, szClassName); +#endif } if(!cls && *start) { lstrcpynW(szClassName, start, sizeof(szClassName)/sizeof(szClassName[0])); cls = MSSTYLES_FindClass(tf, pszAppName, szClassName); +#ifdef __REACTOS__ + if (!defaultCls) + defaultCls = MSSTYLES_FindClass(tf, NULL, szClassName); +#endif } if(cls) { TRACE("Opened app %s, class %s from list %s\n", debugstr_w(cls->szAppName), debugstr_w(cls->szClassName), debugstr_w(pszClassList)); @@ -790,6 +801,16 @@ cls->tf->dwRefCount++; TRACE("Theme %p refcount: %d\n", tf, tf->dwRefCount); } +#ifdef __REACTOS__ + else if (defaultCls) + { + cls = defaultCls; + TRACE("Opened default class %s from list %s\n", debugstr_w(cls->szClassName), debugstr_w(pszClassList)); + cls->tf = tf; + cls->tf->dwRefCount++; + TRACE("Theme %p refcount: %d\n", tf, tf->dwRefCount); + } +#endif return cls; }

9 years, 4 months

[aandrejevic] 68110: [NTVDM] Make fast memory hooks FASTCALL. Only register the VGA memory hook for the region that needs to be hooked.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Jun 12 16:25:23 2015 New Revision: 68110 URL: http://svn.reactos.org/svn/reactos?rev=68110&view=rev Log: [NTVDM] Make fast memory hooks FASTCALL. Only register the VGA memory hook for the region that needs to be hooked. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h trunk/reactos/subsystems/mvdm/ntvdm/memory.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/bios.c [iso-8859-1] Fri Jun 12 16:25:23 2015 @@ -42,7 +42,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -static BOOLEAN NTAPI BiosRomWrite(ULONG Address, PVOID Buffer, ULONG Size) +static BOOLEAN FASTCALL BiosRomWrite(ULONG Address, PVOID Buffer, ULONG Size) { /* Prevent writing to ROM */ return FALSE; Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/emsdrv.c [iso-8859-1] Fri Jun 12 16:25:23 2015 @@ -402,7 +402,7 @@ } } -static VOID NTAPI EmsReadMemory(ULONG Address, PVOID Buffer, ULONG Size) +static VOID FASTCALL EmsReadMemory(ULONG Address, PVOID Buffer, ULONG Size) { ULONG i; ULONG RelativeAddress = Address - TO_LINEAR(EMS_SEGMENT, 0); @@ -422,7 +422,7 @@ } } -static BOOLEAN NTAPI EmsWriteMemory(ULONG Address, PVOID Buffer, ULONG Size) +static BOOLEAN FASTCALL EmsWriteMemory(ULONG Address, PVOID Buffer, ULONG Size) { ULONG i; ULONG RelativeAddress = Address - TO_LINEAR(EMS_SEGMENT, 0); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] Fri Jun 12 16:25:23 2015 @@ -21,8 +21,8 @@ /* PRIVATE VARIABLES **********************************************************/ -static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; -static CONST DWORD MemoryLimit[] = { 0xBFFFF, 0xAFFFF, 0xB7FFF, 0xBFFFF }; +static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; +static CONST DWORD MemorySize[] = { 0x20000, 0x10000, 0x8000, 0x8000 }; /* * Activate this line if you want to use the real @@ -429,11 +429,6 @@ return MemoryBase[(VgaGcRegisters[VGA_GC_MISC_REG] >> 2) & 0x03]; } -static inline DWORD VgaGetVideoLimitAddress(VOID) -{ - return MemoryLimit[(VgaGcRegisters[VGA_GC_MISC_REG] >> 2) & 0x03]; -} - static VOID VgaUpdateCursorPosition(VOID) { /* @@ -1535,6 +1530,20 @@ { case VGA_GC_MISC_REG: { + /* Remove any existing VGA memory hook */ + MemRemoveFastMemoryHook((PVOID)0xA0000, 0x20000); + + if (VgaMiscRegister & VGA_MISC_RAM_ENABLED) + { + UCHAR MemoryMap = (VgaGcRegisters[VGA_GC_MISC_REG] >> 2) & 0x03; + + /* Register a memory hook */ + MemInstallFastMemoryHook((PVOID)MemoryBase[MemoryMap], + MemorySize[MemoryMap], + VgaReadMemory, + VgaWriteMemory); + } + /* The GC misc register decides if it's text or graphics mode */ ModeChanged = TRUE; break; @@ -1687,7 +1696,20 @@ UnregisterIoPort(0x3DA); // VGA_INSTAT1_READ_COLOR, VGA_FEATURE_WRITE_COLOR } - // if (VgaMiscRegister & 0x02) { /* Enable RAM access */ } else { /* Disable RAM access */ } + /* Remove any existing VGA memory hook */ + MemRemoveFastMemoryHook((PVOID)0xA0000, 0x20000); + + if (VgaMiscRegister & VGA_MISC_RAM_ENABLED) + { + UCHAR MemoryMap = (VgaGcRegisters[VGA_GC_MISC_REG] >> 2) & 0x03; + + /* Register a memory hook */ + MemInstallFastMemoryHook((PVOID)MemoryBase[MemoryMap], + MemorySize[MemoryMap], + VgaReadMemory, + VgaWriteMemory); + } + break; } @@ -1946,7 +1968,7 @@ VgaVerticalRetrace(0); } -VOID NTAPI VgaReadMemory(ULONG Address, PVOID Buffer, ULONG Size) +VOID FASTCALL VgaReadMemory(ULONG Address, PVOID Buffer, ULONG Size) { DWORD i, j; DWORD VideoAddress; @@ -2007,7 +2029,7 @@ VgaLatchRegisters[3] = VgaMemory[(3 * VGA_BANK_SIZE) + LOWORD(VideoAddress)]; } -BOOLEAN NTAPI VgaWriteMemory(ULONG Address, PVOID Buffer, ULONG Size) +BOOLEAN FASTCALL VgaWriteMemory(ULONG Address, PVOID Buffer, ULONG Size) { DWORD i, j; DWORD VideoAddress; @@ -2177,9 +2199,6 @@ /* Clear the VGA memory */ VgaClearMemory(); - - /* Register the memory hook */ - MemInstallFastMemoryHook((PVOID)0xA0000, 0x20000, VgaReadMemory, VgaWriteMemory); /* Register the I/O Ports */ RegisterIoPort(0x3CC, VgaReadPort, NULL); // VGA_MISC_READ Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h [iso-8859-1] Fri Jun 12 16:25:23 2015 @@ -256,6 +256,8 @@ COORD VgaGetDisplayResolution(VOID); VOID VgaRefreshDisplay(VOID); +VOID FASTCALL VgaReadMemory(ULONG Address, PVOID Buffer, ULONG Size); +BOOLEAN FASTCALL VgaWriteMemory(ULONG Address, PVOID Buffer, ULONG Size); VOID VgaWriteFont(UINT FontNumber, CONST UCHAR *FontData, UINT Height); VOID VgaClearMemory(VOID); BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Horizontal, PBOOLEAN Vertical); Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] Fri Jun 12 16:25:23 2015 @@ -14,7 +14,7 @@ #define TOTAL_PAGES (MAX_ADDRESS / PAGE_SIZE) typedef VOID -(WINAPI *PMEMORY_READ_HANDLER) +(FASTCALL *PMEMORY_READ_HANDLER) ( ULONG Address, PVOID Buffer, @@ -22,7 +22,7 @@ ); typedef BOOLEAN -(WINAPI *PMEMORY_WRITE_HANDLER) +(FASTCALL *PMEMORY_WRITE_HANDLER) ( ULONG Address, PVOID Buffer,

9 years, 4 months

[aandrejevic] 68109: [FAST486][NTVDM] Use FASTCALL instead of NTAPI. Merge EmulatorReadMemory with MemRead and EmulatorWriteMemory with MemWrite.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Fri Jun 12 03:30:40 2015 New Revision: 68109 URL: http://svn.reactos.org/svn/reactos?rev=68109&view=rev Log: [FAST486][NTVDM] Use FASTCALL instead of NTAPI. Merge EmulatorReadMemory with MemRead and EmulatorWriteMemory with MemWrite. Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h trunk/reactos/lib/fast486/debug.c trunk/reactos/lib/fast486/fast486.c trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.h trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.c trunk/reactos/subsystems/mvdm/ntvdm/emulator.h trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c trunk/reactos/subsystems/mvdm/ntvdm/io.c trunk/reactos/subsystems/mvdm/ntvdm/io.h trunk/reactos/subsystems/mvdm/ntvdm/memory.c trunk/reactos/subsystems/mvdm/ntvdm/memory.h Modified: trunk/reactos/include/reactos/libs/fast486/fast486.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/libs/fast4… ============================================================================== --- trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/libs/fast486/fast486.h [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -182,7 +182,7 @@ typedef VOID -(NTAPI *FAST486_MEM_READ_PROC) +(FASTCALL *FAST486_MEM_READ_PROC) ( PFAST486_STATE State, ULONG Address, @@ -192,7 +192,7 @@ typedef VOID -(NTAPI *FAST486_MEM_WRITE_PROC) +(FASTCALL *FAST486_MEM_WRITE_PROC) ( PFAST486_STATE State, ULONG Address, @@ -202,7 +202,7 @@ typedef VOID -(NTAPI *FAST486_IO_READ_PROC) +(FASTCALL *FAST486_IO_READ_PROC) ( PFAST486_STATE State, USHORT Port, @@ -213,7 +213,7 @@ typedef VOID -(NTAPI *FAST486_IO_WRITE_PROC) +(FASTCALL *FAST486_IO_WRITE_PROC) ( PFAST486_STATE State, USHORT Port, @@ -224,7 +224,7 @@ typedef VOID -(NTAPI *FAST486_BOP_PROC) +(FASTCALL *FAST486_BOP_PROC) ( PFAST486_STATE State, UCHAR BopCode @@ -232,14 +232,14 @@ typedef UCHAR -(NTAPI *FAST486_INT_ACK_PROC) +(FASTCALL *FAST486_INT_ACK_PROC) ( PFAST486_STATE State ); typedef VOID -(NTAPI *FAST486_FPU_PROC) +(FASTCALL *FAST486_FPU_PROC) ( PFAST486_STATE State ); Modified: trunk/reactos/lib/fast486/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/debug.c?rev=68… ============================================================================== --- trunk/reactos/lib/fast486/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/debug.c [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -43,91 +43,82 @@ /* PRIVATE FUNCTIONS **********************************************************/ -#if 0 -static inline VOID -NTAPI +FORCEINLINE +VOID +FASTCALL Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command) { UCHAR Opcode; FAST486_OPCODE_HANDLER_PROC CurrentHandler; INT ProcedureCallCount = 0; + BOOLEAN Trap; /* Main execution loop */ do { + Trap = State->Flags.Tf; + + if (!State->Halted) + { NextInst: - /* Check if this is a new instruction */ - if (State->PrefixFlags == 0) State->SavedInstPtr = State->InstPtr; - - /* Perform an instruction fetch */ - if (!Fast486FetchByte(State, &Opcode)) - { - /* Exception occurred */ + /* Check if this is a new instruction */ + if (State->PrefixFlags == 0) + { + State->SavedInstPtr = State->InstPtr; + State->SavedStackPtr = State->GeneralRegs[FAST486_REG_ESP]; + } + + /* Perform an instruction fetch */ + if (!Fast486FetchByte(State, &Opcode)) + { + /* Exception occurred */ + State->PrefixFlags = 0; + continue; + } + + // TODO: Check for CALL/RET to update ProcedureCallCount. + + /* Call the opcode handler */ + CurrentHandler = Fast486OpcodeHandlers[Opcode]; + CurrentHandler(State, Opcode); + + /* If this is a prefix, go to the next instruction immediately */ + if (CurrentHandler == Fast486OpcodePrefix) goto NextInst; + + /* A non-prefix opcode has been executed, reset the prefix flags */ State->PrefixFlags = 0; - continue; - } - - // TODO: Check for CALL/RET to update ProcedureCallCount. - - /* Call the opcode handler */ - CurrentHandler = Fast486OpcodeHandlers[Opcode]; - CurrentHandler(State, Opcode); - - /* If this is a prefix, go to the next instruction immediately */ - if (CurrentHandler == Fast486OpcodePrefix) goto NextInst; - - /* A non-prefix opcode has been executed, reset the prefix flags */ - State->PrefixFlags = 0; + } /* * Check if there is an interrupt to execute, or a hardware interrupt signal * while interrupts are enabled. */ - if (State->Flags.Tf) + if (State->DoNotInterrupt) + { + /* Clear the interrupt delay flag */ + State->DoNotInterrupt = FALSE; + } + else if (Trap && !State->Halted) { /* Perform the interrupt */ - Fast486PerformInterrupt(State, 0x01); - - /* - * Flags and TF are pushed on stack so we can reset TF now, - * to not break into the INT 0x01 handler. - * After the INT 0x01 handler returns, the flags and therefore - * TF are popped back off the stack and restored, so TF will be - * automatically reset to its previous state. - */ - State->Flags.Tf = FALSE; - } - else if (State->IntStatus == FAST486_INT_EXECUTE) - { - /* Perform the interrupt */ - Fast486PerformInterrupt(State, State->PendingIntNum); + Fast486PerformInterrupt(State, FAST486_EXCEPTION_DB); + } + else if (State->Flags.If && State->IntSignaled) + { + /* No longer halted */ + State->Halted = FALSE; + + /* Acknowledge the interrupt and perform it */ + Fast486PerformInterrupt(State, State->IntAckCallback(State)); /* Clear the interrupt status */ - State->IntStatus = FAST486_INT_NONE; - } - else if (State->Flags.If && (State->IntStatus == FAST486_INT_SIGNAL)) - { - /* Acknowledge the interrupt to get the number */ - State->PendingIntNum = State->IntAckCallback(State); - - /* Set the interrupt status to execute on the next instruction */ - State->IntStatus = FAST486_INT_EXECUTE; - } - else if (State->IntStatus == FAST486_INT_DELAYED) - { - /* Restore the old state */ - State->IntStatus = FAST486_INT_EXECUTE; + State->IntSignaled = FALSE; } } while ((Command == FAST486_CONTINUE) || (Command == FAST486_STEP_OVER && ProcedureCallCount > 0) || (Command == FAST486_STEP_OUT && ProcedureCallCount >= 0)); } -#else -VOID -NTAPI -Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command); -#endif /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/lib/fast486/fast486.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fast486/fast486.c?rev=… ============================================================================== --- trunk/reactos/lib/fast486/fast486.c [iso-8859-1] (original) +++ trunk/reactos/lib/fast486/fast486.c [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -31,98 +31,10 @@ #include "opcodes.h" #include "fpu.h" -/* DEFINES ********************************************************************/ - -typedef enum -{ - FAST486_STEP_INTO, - FAST486_STEP_OVER, - FAST486_STEP_OUT, - FAST486_CONTINUE -} FAST486_EXEC_CMD; - -/* PRIVATE FUNCTIONS **********************************************************/ - -VOID -NTAPI -Fast486ExecutionControl(PFAST486_STATE State, FAST486_EXEC_CMD Command) -{ - UCHAR Opcode; - FAST486_OPCODE_HANDLER_PROC CurrentHandler; - INT ProcedureCallCount = 0; - BOOLEAN Trap; - - /* Main execution loop */ - do - { - Trap = State->Flags.Tf; - - if (!State->Halted) - { -NextInst: - /* Check if this is a new instruction */ - if (State->PrefixFlags == 0) - { - State->SavedInstPtr = State->InstPtr; - State->SavedStackPtr = State->GeneralRegs[FAST486_REG_ESP]; - } - - /* Perform an instruction fetch */ - if (!Fast486FetchByte(State, &Opcode)) - { - /* Exception occurred */ - State->PrefixFlags = 0; - continue; - } - - // TODO: Check for CALL/RET to update ProcedureCallCount. - - /* Call the opcode handler */ - CurrentHandler = Fast486OpcodeHandlers[Opcode]; - CurrentHandler(State, Opcode); - - /* If this is a prefix, go to the next instruction immediately */ - if (CurrentHandler == Fast486OpcodePrefix) goto NextInst; - - /* A non-prefix opcode has been executed, reset the prefix flags */ - State->PrefixFlags = 0; - } - - /* - * Check if there is an interrupt to execute, or a hardware interrupt signal - * while interrupts are enabled. - */ - if (State->DoNotInterrupt) - { - /* Clear the interrupt delay flag */ - State->DoNotInterrupt = FALSE; - } - else if (Trap && !State->Halted) - { - /* Perform the interrupt */ - Fast486PerformInterrupt(State, FAST486_EXCEPTION_DB); - } - else if (State->Flags.If && State->IntSignaled) - { - /* No longer halted */ - State->Halted = FALSE; - - /* Acknowledge the interrupt and perform it */ - Fast486PerformInterrupt(State, State->IntAckCallback(State)); - - /* Clear the interrupt status */ - State->IntSignaled = FALSE; - } - } - while ((Command == FAST486_CONTINUE) || - (Command == FAST486_STEP_OVER && ProcedureCallCount > 0) || - (Command == FAST486_STEP_OUT && ProcedureCallCount >= 0)); -} - /* DEFAULT CALLBACKS **********************************************************/ static VOID -NTAPI +FASTCALL Fast486MemReadCallback(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) { UNREFERENCED_PARAMETER(State); @@ -130,7 +42,7 @@ } static VOID -NTAPI +FASTCALL Fast486MemWriteCallback(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) { UNREFERENCED_PARAMETER(State); @@ -138,7 +50,7 @@ } static VOID -NTAPI +FASTCALL Fast486IoReadCallback(PFAST486_STATE State, USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) { UNREFERENCED_PARAMETER(State); @@ -149,7 +61,7 @@ } static VOID -NTAPI +FASTCALL Fast486IoWriteCallback(PFAST486_STATE State, USHORT Port, PVOID Buffer, ULONG DataCount, UCHAR DataSize) { UNREFERENCED_PARAMETER(State); @@ -160,7 +72,7 @@ } static VOID -NTAPI +FASTCALL Fast486BopCallback(PFAST486_STATE State, UCHAR BopCode) { UNREFERENCED_PARAMETER(State); @@ -168,7 +80,7 @@ } static UCHAR -NTAPI +FASTCALL Fast486IntAckCallback(PFAST486_STATE State) { UNREFERENCED_PARAMETER(State); @@ -177,7 +89,8 @@ return 0x01; } -static VOID NTAPI +static VOID +FASTCALL Fast486FpuCallback(PFAST486_STATE State) { UNREFERENCED_PARAMETER(State); Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -15,6 +15,7 @@ #include "emulator.h" #include "cpu/cpu.h" #include "cpu/bop.h" +#include "memory.h" #include "bios.h" // #include "vidbios.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.c [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -29,7 +29,7 @@ BopProc[BopCode] = BopHandler; } -VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode) +VOID FASTCALL EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode) { WORD StackSegment, StackPointer; LPWORD Stack; Modified: trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/cpu/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/cpu/bop.h [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -21,7 +21,7 @@ typedef VOID (WINAPI *EMULATOR_BOP_PROC)(LPWORD Stack); VOID RegisterBop(BYTE BopCode, EMULATOR_BOP_PROC BopHandler); -VOID WINAPI EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode); +VOID FASTCALL EmulatorBiosOperation(PFAST486_STATE State, UCHAR BopCode); #endif // _BOP_H_ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -704,7 +704,10 @@ if (ReadFile(Descriptor->Win32Handle, LocalBuffer, Count, &BytesRead32, NULL)) { /* Write to the memory */ - MemWrite(TO_LINEAR(HIWORD(Buffer), LOWORD(Buffer)), LocalBuffer, LOWORD(BytesRead32)); + EmulatorWriteMemory(&EmulatorContext, + TO_LINEAR(HIWORD(Buffer), LOWORD(Buffer)), + LocalBuffer, + LOWORD(BytesRead32)); /* Update the position */ Descriptor->Position += BytesRead32; @@ -756,7 +759,11 @@ ASSERT(LocalBuffer != NULL); /* Read from the memory */ - MemRead(TO_LINEAR(HIWORD(Buffer), LOWORD(Buffer)), LocalBuffer, Count); + EmulatorReadMemory(&EmulatorContext, + TO_LINEAR(HIWORD(Buffer), + LOWORD(Buffer)), + LocalBuffer, + Count); /* Write the file */ if (WriteFile(Descriptor->Win32Handle, LocalBuffer, Count, &BytesWritten32, NULL)) Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -13,6 +13,7 @@ #include "ntvdm.h" #include "emulator.h" #include "cpu/bop.h" +#include "../../memory.h" #include "io.h" #include "hardware/ps2.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/memory.h [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -6,8 +6,8 @@ * PROGRAMMERS: Aleksandar Andrejevic <theflash AT sdf DOT lonestar DOT org> */ -#ifndef _MEMORY_H_ -#define _MEMORY_H_ +#ifndef _DOS_MEMORY_H_ +#define _DOS_MEMORY_H_ /* TYPEDEFS *******************************************************************/ @@ -45,6 +45,6 @@ BOOLEAN DosUnlinkUmb(VOID); VOID DosChangeMemoryOwner(WORD Segment, WORD NewOwner); -#endif // _MEMORY_H_ +#endif // _DOS_MEMORY_H_ /* EOF */ Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/mouse32.c [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -24,6 +24,7 @@ #include "bios/bios.h" #include "bios/bios32/bios32p.h" +#include "memory.h" #include "io.h" #include "dos32krnl/dos.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.c [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -42,8 +42,6 @@ LPVOID BaseAddress = NULL; BOOLEAN VdmRunning = TRUE; -static BOOLEAN A20Line = FALSE; - static HANDLE InputThread = NULL; LPCWSTR ExceptionName[] = @@ -63,46 +61,7 @@ /* PRIVATE FUNCTIONS **********************************************************/ -VOID WINAPI EmulatorReadMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) -{ - UNREFERENCED_PARAMETER(State); - - /* Mirror 0x000FFFF0 at 0xFFFFFFF0 */ - if (Address >= 0xFFFFFFF0) Address -= 0xFFF00000; - - /* If the A20 line is disabled, mask bit 20 */ - if (!A20Line) Address &= ~(1 << 20); - - if ((Address + Size - 1) >= MAX_ADDRESS) - { - ULONG ExtraStart = (Address < MAX_ADDRESS) ? MAX_ADDRESS - Address : 0; - - /* Fill the memory that was above the limit with 0xFF */ - RtlFillMemory((PVOID)((ULONG_PTR)Buffer + ExtraStart), Size - ExtraStart, 0xFF); - - if (Address < MAX_ADDRESS) Size = MAX_ADDRESS - Address; - else return; - } - - /* Read while calling fast memory hooks */ - MemRead(Address, Buffer, Size); -} - -VOID WINAPI EmulatorWriteMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) -{ - UNREFERENCED_PARAMETER(State); - - /* If the A20 line is disabled, mask bit 20 */ - if (!A20Line) Address &= ~(1 << 20); - - if (Address >= MAX_ADDRESS) return; - Size = min(Size, MAX_ADDRESS - Address); - - /* Write while calling fast memory hooks */ - MemWrite(Address, Buffer, Size); -} - -UCHAR WINAPI EmulatorIntAcknowledge(PFAST486_STATE State) +UCHAR FASTCALL EmulatorIntAcknowledge(PFAST486_STATE State) { UNREFERENCED_PARAMETER(State); @@ -110,7 +69,7 @@ return PicGetInterrupt(); } -VOID WINAPI EmulatorFpu(PFAST486_STATE State) +VOID FASTCALL EmulatorFpu(PFAST486_STATE State) { /* The FPU is wired to IRQ 13 */ PicInterruptRequest(13); @@ -164,16 +123,6 @@ Fast486InterruptSignal(&EmulatorContext); } -VOID EmulatorSetA20(BOOLEAN Enabled) -{ - A20Line = Enabled; -} - -BOOLEAN EmulatorGetA20(VOID) -{ - return A20Line; -} - static VOID WINAPI EmulatorDebugBreakBop(LPWORD Stack) { DPRINT1("NTVDM: BOP_DEBUGGER\n"); Modified: trunk/reactos/subsystems/mvdm/ntvdm/emulator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/emul… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/emulator.h [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -90,7 +90,7 @@ EMULATOR_EXCEPTION_PAGE_FAULT }; -// extern FAST486_STATE EmulatorContext; +extern FAST486_STATE EmulatorContext; extern LPVOID BaseAddress; extern BOOLEAN VdmRunning; @@ -98,28 +98,12 @@ VOID DumpMemory(BOOLEAN TextFormat); -VOID WINAPI EmulatorReadMemory -( - PFAST486_STATE State, - ULONG Address, - PVOID Buffer, - ULONG Size -); - -VOID WINAPI EmulatorWriteMemory -( - PFAST486_STATE State, - ULONG Address, - PVOID Buffer, - ULONG Size -); - -UCHAR WINAPI EmulatorIntAcknowledge +UCHAR FASTCALL EmulatorIntAcknowledge ( PFAST486_STATE State ); -VOID WINAPI EmulatorFpu +VOID FASTCALL EmulatorFpu ( PFAST486_STATE State ); @@ -129,8 +113,6 @@ VOID EmulatorTerminate(VOID); VOID EmulatorInterruptSignal(VOID); -VOID EmulatorSetA20(BOOLEAN Enabled); -BOOLEAN EmulatorGetA20(VOID); BOOLEAN EmulatorInitialize(HANDLE ConsoleInput, HANDLE ConsoleOutput); VOID EmulatorCleanup(VOID); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/dma.c [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -477,13 +477,13 @@ if (Increment) { - MemWrite(CurrAddress, dmabuf, length); + EmulatorWriteMemory(&EmulatorContext, CurrAddress, dmabuf, length); } else { for (i = 0; i < length; i++) { - MemWrite(CurrAddress - i, dmabuf + i, sizeof(BYTE)); + EmulatorWriteMemory(&EmulatorContext, CurrAddress - i, dmabuf + i, sizeof(BYTE)); } } @@ -498,13 +498,13 @@ if (Increment) { - MemRead(CurrAddress, dmabuf, length); + EmulatorReadMemory(&EmulatorContext, CurrAddress, dmabuf, length); } else { for (i = 0; i < length; i++) { - MemRead(CurrAddress - i, dmabuf + i, sizeof(BYTE)); + EmulatorReadMemory(&EmulatorContext, CurrAddress - i, dmabuf + i, sizeof(BYTE)); } } Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/ps2.c [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -15,6 +15,7 @@ #include "emulator.h" #include "ps2.h" +#include "memory.h" #include "io.h" #include "pic.h" #include "clock.h" Modified: trunk/reactos/subsystems/mvdm/ntvdm/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/io.c… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/io.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/io.c [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -343,7 +343,7 @@ RtlZeroMemory(&IoPortProc[Port], sizeof(IoPortProc[Port])); } -VOID WINAPI +VOID FASTCALL EmulatorReadIo(PFAST486_STATE State, USHORT Port, PVOID Buffer, @@ -418,7 +418,7 @@ } } -VOID WINAPI +VOID FASTCALL EmulatorWriteIo(PFAST486_STATE State, USHORT Port, PVOID Buffer, Modified: trunk/reactos/subsystems/mvdm/ntvdm/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/io.h… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/io.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/io.h [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -85,7 +85,7 @@ VOID UnregisterIoPort(USHORT Port); -VOID WINAPI EmulatorReadIo +VOID FASTCALL EmulatorReadIo ( PFAST486_STATE State, USHORT Port, @@ -94,7 +94,7 @@ UCHAR DataSize ); -VOID WINAPI EmulatorWriteIo +VOID FASTCALL EmulatorWriteIo ( PFAST486_STATE State, USHORT Port, Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.c [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -36,6 +36,7 @@ static LIST_ENTRY HookList; static PMEM_HOOK PageTable[TOTAL_PAGES] = { NULL }; +static BOOLEAN A20Line = FALSE; /* PRIVATE FUNCTIONS **********************************************************/ @@ -137,12 +138,32 @@ /* PUBLIC FUNCTIONS ***********************************************************/ -VOID -MemRead(ULONG Address, PVOID Buffer, ULONG Size) +VOID FASTCALL EmulatorReadMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) { ULONG i, Offset, Length; - ULONG FirstPage = Address >> 12; - ULONG LastPage = (Address + Size - 1) >> 12; + ULONG FirstPage, LastPage; + + UNREFERENCED_PARAMETER(State); + + /* Mirror 0x000FFFF0 at 0xFFFFFFF0 */ + if (Address >= 0xFFFFFFF0) Address -= 0xFFF00000; + + /* If the A20 line is disabled, mask bit 20 */ + if (!A20Line) Address &= ~(1 << 20); + + if ((Address + Size - 1) >= MAX_ADDRESS) + { + ULONG ExtraStart = (Address < MAX_ADDRESS) ? MAX_ADDRESS - Address : 0; + + /* Fill the memory that was above the limit with 0xFF */ + RtlFillMemory((PVOID)((ULONG_PTR)Buffer + ExtraStart), Size - ExtraStart, 0xFF); + + if (Address < MAX_ADDRESS) Size = MAX_ADDRESS - Address; + else return; + } + + FirstPage = Address >> 12; + LastPage = (Address + Size - 1) >> 12; if (FirstPage == LastPage) { @@ -161,12 +182,21 @@ } } -VOID -MemWrite(ULONG Address, PVOID Buffer, ULONG Size) +VOID FASTCALL EmulatorWriteMemory(PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size) { ULONG i, Offset, Length; - ULONG FirstPage = Address >> 12; - ULONG LastPage = (Address + Size - 1) >> 12; + ULONG FirstPage, LastPage; + + UNREFERENCED_PARAMETER(State); + + /* If the A20 line is disabled, mask bit 20 */ + if (!A20Line) Address &= ~(1 << 20); + + if (Address >= MAX_ADDRESS) return; + Size = min(Size, MAX_ADDRESS - Address); + + FirstPage = Address >> 12; + LastPage = (Address + Size - 1) >> 12; if (FirstPage == LastPage) { @@ -183,6 +213,16 @@ Buffer = (PVOID)((ULONG_PTR)Buffer + Length); } } +} + +VOID EmulatorSetA20(BOOLEAN Enabled) +{ + A20Line = Enabled; +} + +BOOLEAN EmulatorGetA20(VOID) +{ + return A20Line; } VOID Modified: trunk/reactos/subsystems/mvdm/ntvdm/memory.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/memo… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/memory.h [iso-8859-1] Fri Jun 12 03:30:40 2015 @@ -36,20 +36,27 @@ VOID MemExceptionHandler(ULONG FaultAddress, BOOLEAN Writing); VOID -MemRead +FASTCALL +EmulatorReadMemory ( + PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size ); VOID -MemWrite +FASTCALL +EmulatorWriteMemory ( + PFAST486_STATE State, ULONG Address, PVOID Buffer, ULONG Size ); + +VOID EmulatorSetA20(BOOLEAN Enabled); +BOOLEAN EmulatorGetA20(VOID); BOOL MemInstallFastMemoryHook

9 years, 4 months

[hbelusca] 68108: [NTVDM]: The DOS session ID specified in the NTVDM command line is in hexadecimal format (and not decimal!). Fixes NTVDM start with double-click after 9-10 launches, on ROS and Wi...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Fri Jun 12 01:19:19 2015 New Revision: 68108 URL: http://svn.reactos.org/svn/reactos?rev=68108&view=rev Log: [NTVDM]: The DOS session ID specified in the NTVDM command line is in hexadecimal format (and not decimal!). Fixes NTVDM start with double-click after 9-10 launches, on ROS and Windows. Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c Modified: trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/dos/… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/dos/dem.c [iso-8859-1] Fri Jun 12 01:19:19 2015 @@ -461,8 +461,8 @@ { if (wcsncmp(NtVdmArgv[i], L"-i", 2) == 0) { - /* This is the session ID */ - SessionId = wcstoul(NtVdmArgv[i] + 2, NULL, 10); + /* This is the session ID (hex format) */ + SessionId = wcstoul(NtVdmArgv[i] + 2, NULL, 16); /* The VDM hasn't been started from a console, so quit when the task is done */ AcceptCommands = FALSE;

9 years, 4 months

← Newer
1
...
19
20
21
22
23
24
25
...
35
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 June 2015