Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[reactos] 01/01: [WIN32SS:NTGDI] Fix missing text in labels and buttons for .NET apps. CORE-15000

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0e56ec8892a737823b4b0… commit 0e56ec8892a737823b4b008f02ae0261cbf0b64a Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Mar 14 01:36:45 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Thu Mar 14 01:36:45 2019 +0100 [WIN32SS:NTGDI] Fix missing text in labels and buttons for .NET apps. CORE-15000 There was a missing break statement in ftGdiGetGlyphOutline(). Found by JIRA contributor 'I_Kill_Bugs' :-) Add also brackets around 'case's to make code navigation easier. --- win32ss/gdi/ntgdi/freetype.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 7005057a07..5f9b2213ea 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -3693,6 +3693,7 @@ ftGdiGetGlyphOutline( switch (iFormat) { case GGO_BITMAP: + { width = gm.gmBlackBoxX; height = gm.gmBlackBoxY; pitch = ((width + 31) >> 5) << 2; @@ -3720,6 +3721,7 @@ ftGdiGetGlyphOutline( } case ft_glyph_format_outline: + { ft_bitmap.width = width; ft_bitmap.rows = height; ft_bitmap.pitch = pitch; @@ -3737,12 +3739,15 @@ ftGdiGetGlyphOutline( FT_Outline_Get_Bitmap(g_FreeTypeLibrary, &ft_face->glyph->outline, &ft_bitmap); IntUnLockFreeType(); break; + } default: DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format); return GDI_ERROR; } + break; + } case GGO_GRAY2_BITMAP: case GGO_GRAY4_BITMAP: @@ -3828,6 +3833,8 @@ ftGdiGetGlyphOutline( DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format); return GDI_ERROR; } + + break; } case GGO_NATIVE: @@ -3855,6 +3862,7 @@ ftGdiGetGlyphOutline( IntUnLockFreeType(); break; } + case GGO_BEZIER: { FT_Outline *outline = &ft_face->glyph->outline;

5 years, 8 months

[reactos] 01/01: [User32] Support WM_COPYGLOBALDATA

by jimtabor

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc534efbc5bd7417e24b6… commit bc534efbc5bd7417e24b6e642b3438c5e47a0131 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Wed Mar 13 12:16:52 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Wed Mar 13 12:16:52 2019 -0500 [User32] Support WM_COPYGLOBALDATA Implement support for WM_COPYGLOBALDATA. Needs more tests. Tested DropTest from CORE-15836. --- win32ss/user/user32/windows/defwnd.c | 6 ++++++ win32ss/user/user32/windows/message.c | 31 ++++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/win32ss/user/user32/windows/defwnd.c b/win32ss/user/user32/windows/defwnd.c index ad2bbbbe5d5..baa31e7af0a 100644 --- a/win32ss/user/user32/windows/defwnd.c +++ b/win32ss/user/user32/windows/defwnd.c @@ -748,6 +748,12 @@ User32DefWindowProc(HWND hWnd, break; } + case WM_COPYGLOBALDATA: + { + TRACE("WM_COPYGLOBALDATA hGlobal %p Size %d Flags 0x%x\n",lParam,wParam,GlobalFlags((HGLOBAL)lParam)); + return lParam; + } + /* Move to Win32k !*/ case WM_SHOWWINDOW: if (!lParam) break; // Call when it is necessary. diff --git a/win32ss/user/user32/windows/message.c b/win32ss/user/user32/windows/message.c index 57f15d85b3f..a96b799456c 100644 --- a/win32ss/user/user32/windows/message.c +++ b/win32ss/user/user32/windows/message.c @@ -392,6 +392,13 @@ MsgiUMToKMMessage(PMSG UMMsg, PMSG KMMsg, BOOL Posted) } break; + case WM_COPYGLOBALDATA: + { + KMMsg->lParam = (LPARAM)GlobalLock((HGLOBAL)UMMsg->lParam);; + TRACE("WM_COPYGLOBALDATA get data ptr %p\n",KMMsg->lParam); + } + break; + default: break; } @@ -408,6 +415,11 @@ MsgiUMToKMCleanup(PMSG UMMsg, PMSG KMMsg) case WM_COPYDATA: HeapFree(GetProcessHeap(), 0, (LPVOID) KMMsg->lParam); break; + case WM_COPYGLOBALDATA: + TRACE("WM_COPYGLOBALDATA cleanup return\n"); + GlobalUnlock((HGLOBAL)UMMsg->lParam); + GlobalFree((HGLOBAL)UMMsg->lParam); + break; default: break; } @@ -452,6 +464,18 @@ MsgiKMToUMMessage(PMSG KMMsg, PMSG UMMsg) } break; + case WM_COPYGLOBALDATA: + { + PVOID Data; + HGLOBAL hGlobal = GlobalAlloc(GHND | GMEM_SHARE, KMMsg->wParam); + Data = GlobalLock(hGlobal); + if (Data) RtlCopyMemory(Data, (PVOID)KMMsg->lParam, KMMsg->wParam); + GlobalUnlock(hGlobal); + TRACE("WM_COPYGLOBALDATA to User hGlobal %p\n",hGlobal); + UMMsg->lParam = (LPARAM)hGlobal; + } + break; + default: break; } @@ -465,7 +489,7 @@ MsgiKMToUMCleanup(PMSG KMMsg, PMSG UMMsg) switch (KMMsg->message) { case WM_DDE_EXECUTE: -#ifdef TODO +#ifdef TODO // Kept as historic. HeapFree(GetProcessHeap(), 0, (LPVOID) KMMsg->lParam); GlobalUnlock((HGLOBAL) UMMsg->lParam); #endif @@ -2935,6 +2959,11 @@ User32CallWindowProcFromKernel(PVOID Arguments, ULONG ArgumentLength) TRACE("WM_CREATE CB %p lParam %p\n",CallbackArgs, KMMsg.lParam); break; } + case WM_NCCREATE: + { + TRACE("WM_NCCREATE CB %p lParam %p\n",CallbackArgs, KMMsg.lParam); + break; + } case WM_SYSTIMER: { TRACE("WM_SYSTIMER %p\n",KMMsg.hwnd);

5 years, 8 months

[reactos] 02/02: [DOC] Update 3rd party readme file. CORE-15280

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=77e0409ea95dbb996cfdd… commit 77e0409ea95dbb996cfdd39bbe5e5ab7c97bca64 Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Mar 12 04:45:44 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Mar 13 09:52:51 2019 +0100 [DOC] Update 3rd party readme file. CORE-15280 --- media/doc/3rd Party Files.txt | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/media/doc/3rd Party Files.txt b/media/doc/3rd Party Files.txt index ccd1a755b8d..8561d828029 100644 --- a/media/doc/3rd Party Files.txt +++ b/media/doc/3rd Party Files.txt @@ -43,15 +43,15 @@ Used Version: 1.0.6 Website: http://www.bzip.org Title: LibXML -Used Version: 2.9.4 +Used Version: 2.9.8 Website: http://xmlsoft.org | ftp://xmlsoft.org/libxml2/ Title: Libxslt -Used Version: 1.1.29 +Used Version: 1.1.33 Website: http://xmlsoft.org Title: ZLib -Used Version: 1.2.8 +Used Version: 1.2.11 Website: http://www.zlib.net Title: GNU FreeFont @@ -63,11 +63,11 @@ Used Version: 2005-07-14 Website: http://www.catch22.net/tuts/cardlib Title: libsamplerate -Used Version: 0.1.8 +Used Version: 0.1.9 Website: http://www.mega-nerd.com/SRC/download.html Title: libmpg123 (used by winemp3.acm) -Used Version: 1.22.4 +Used Version: 1.25.10 Website: http://www.mpg123.de/ Title: STLport @@ -79,13 +79,21 @@ Used Version: git commit 8765259 Website: https://github.com/win-iconv/win-iconv Title: libjpeg -Used Version: 9a +Used Version: 9c Website: http://www.ijg.org/ +Title: libtiff +Used Version: 4.0.9 +Website: http://www.simplesystems.org/libtiff/ + Title: mbed TLS -Used Version: 2.3.0 +Used Version: 2.7.9 Website: https://tls.mbed.org/ Title: libpng -Used Version: 1.6.21 +Used Version: 1.6.36 Website: http://libpng.sourceforge.net/ + +Title: ACPICA +Used Version: 20190215 +Website: https://acpica.org/

5 years, 8 months

[reactos] 01/02: [MAINTAINERS] Add 3rd party library files that I've been syncing.

by Thomas Faber

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=19f9a973e52360b102ce5… commit 19f9a973e52360b102ce57349410ccda6738750b Author: Thomas Faber <thomas.faber(a)reactos.org> AuthorDate: Tue Mar 12 04:45:34 2019 +0100 Commit: Thomas Faber <thomas.faber(a)reactos.org> CommitDate: Wed Mar 13 09:52:47 2019 +0100 [MAINTAINERS] Add 3rd party library files that I've been syncing. CORE-15280 CORE-14291 CORE-13739 CORE-13451 ... --- MAINTAINERS | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index eb6a73707e4..ef0d035d456 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -57,6 +57,24 @@ Descriptions of section entries used here: this area C: Comments +3rd Party File Format Libraries + M: ThFabba, Thomas Faber + S: Upstream + F: dll/3rdparty/libjpeg/ + F: dll/3rdparty/libpng/ + F: dll/3rdparty/libtiff/ + F: dll/3rdparty/libxslt/ + F: sdk/include/reactos/libs/libjpeg/ + F: sdk/include/reactos/libs/libmpg123/ + F: sdk/include/reactos/libs/libpng/ + F: sdk/include/reactos/libs/libtiff/ + F: sdk/include/reactos/libs/libxml/ + F: sdk/include/reactos/libs/libxslt/ + F: sdk/lib/3rdparty/libmpg123/ + F: sdk/lib/3rdparty/libsamplerate/ + F: sdk/lib/3rdparty/libxml2/ + C: See media/doc/3rd Party Files.txt + ACPI M: R: ThFabba, Thomas Faber @@ -133,6 +151,13 @@ Kernel S: Maintained F: ntoskrnl/ +mbed TLS + M: ThFabba, Thomas Faber + S: Upstream + F: dll/3rdparty/mbedtls/ + F: sdk/include/reactos/libs/mbedtls/ + C: See media/doc/3rd Party Files.txt + Network Drivers M: R: ThFabba, Thomas Faber @@ -237,3 +262,10 @@ Wine Tests R: ThFabba, Thomas Faber S: Upstream F: modules/rostests/winetests/ + +zlib + M: ThFabba, Thomas Faber + S: Upstream + F: sdk/include/reactos/libs/zlib/ + F: sdk/lib/3rdparty/zlib/ + C: See media/doc/3rd Party Files.txt

5 years, 8 months

[reactos] 01/01: Revert "[FREETYPE] Fix 3 regressions in one patch"

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=76118320eaa5ed80d5e16… commit 76118320eaa5ed80d5e162da27b642bcad638802 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Tue Mar 12 18:57:21 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Tue Mar 12 18:57:21 2019 +0100 Revert "[FREETYPE] Fix 3 regressions in one patch" This reverts commit 0.4.12-dev-856-g 98b7ecd280c0f641d4593c8ba792b463a5117550 CORE-15785, CORE-15558, CORE-15755. As requested by Pierre, we have very strong indication, that it broke https://build.reactos.org/builders/Test%20KVM and https://build.reactos.org/builders/Test%20VBox --- win32ss/gdi/ntgdi/freetype.c | 196 ++++++++++--------------------------------- 1 file changed, 44 insertions(+), 152 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 4f58f030f27..7005057a077 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -2244,73 +2244,6 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, return Cache->OutlineRequiredSize; } -static PFONTGDI FASTCALL -FindFaceNameInList(PUNICODE_STRING FaceName, PLIST_ENTRY Head) -{ - PLIST_ENTRY Entry; - PFONT_ENTRY CurrentEntry; - ANSI_STRING EntryFaceNameA; - UNICODE_STRING EntryFaceNameW; - FONTGDI *FontGDI; - NTSTATUS status; - - for (Entry = Head->Flink; Entry != Head; Entry = Entry->Flink) - { - CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry); - - FontGDI = CurrentEntry->Font; - ASSERT(FontGDI); - - RtlInitAnsiString(&EntryFaceNameA, FontGDI->SharedFace->Face->family_name); - status = RtlAnsiStringToUnicodeString(&EntryFaceNameW, &EntryFaceNameA, TRUE); - if (!NT_SUCCESS(status)) - { - break; - } - - if ((LF_FACESIZE - 1) * sizeof(WCHAR) < EntryFaceNameW.Length) - { - EntryFaceNameW.Length = (LF_FACESIZE - 1) * sizeof(WCHAR); - EntryFaceNameW.Buffer[LF_FACESIZE - 1] = L'\0'; - } - - if (RtlEqualUnicodeString(FaceName, &EntryFaceNameW, TRUE)) - { - RtlFreeUnicodeString(&EntryFaceNameW); - return FontGDI; - } - - RtlFreeUnicodeString(&EntryFaceNameW); - } - - return NULL; -} - -static PFONTGDI FASTCALL -FindFaceNameInLists(PUNICODE_STRING FaceName) -{ - PPROCESSINFO Win32Process; - PFONTGDI Font; - - /* Search the process local list. - We do not have to search the 'Mem' list, since those fonts are linked in the PrivateFontListHead */ - Win32Process = PsGetCurrentProcessWin32Process(); - IntLockProcessPrivateFonts(Win32Process); - Font = FindFaceNameInList(FaceName, &Win32Process->PrivateFontListHead); - IntUnLockProcessPrivateFonts(Win32Process); - if (NULL != Font) - { - return Font; - } - - /* Search the global list */ - IntLockGlobalFonts(); - Font = FindFaceNameInList(FaceName, &g_FontListHead); - IntUnLockGlobalFonts(); - - return Font; -} - /* See https://msdn.microsoft.com/en-us/library/bb165625(v=vs.90).aspx */ static BYTE CharSetFromLangID(LANGID LangID) @@ -2737,67 +2670,10 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, Info->NewTextMetricEx.ntmFontSig = fs; } -static int FASTCALL -FindFaceNameInInfo(PUNICODE_STRING FaceName, PFONTFAMILYINFO Info, DWORD InfoEntries) -{ - DWORD i; - UNICODE_STRING InfoFaceName; - - for (i = 0; i < InfoEntries; i++) - { - RtlInitUnicodeString(&InfoFaceName, Info[i].EnumLogFontEx.elfLogFont.lfFaceName); - if (RtlEqualUnicodeString(&InfoFaceName, FaceName, TRUE)) - { - return i; - } - } - - return -1; -} - -static BOOLEAN FASTCALL -FontFamilyInclude(LPLOGFONTW LogFont, PUNICODE_STRING FaceName, - PFONTFAMILYINFO Info, DWORD InfoEntries) -{ - UNICODE_STRING LogFontFaceName; - - RtlInitUnicodeString(&LogFontFaceName, LogFont->lfFaceName); - if (0 != LogFontFaceName.Length && - !RtlEqualUnicodeString(&LogFontFaceName, FaceName, TRUE)) - { - return FALSE; - } - - return FindFaceNameInInfo(FaceName, Info, InfoEntries) < 0; -} - -static BOOL FASTCALL -FontFamilyFound(PFONTFAMILYINFO InfoEntry, - PFONTFAMILYINFO Info, DWORD InfoCount) -{ - LPLOGFONTW plf1 = &InfoEntry->EnumLogFontEx.elfLogFont; - LPWSTR pFullName1 = InfoEntry->EnumLogFontEx.elfFullName; - LPWSTR pFullName2; - DWORD i; - - for (i = 0; i < InfoCount; ++i) - { - LPLOGFONTW plf2 = &Info[i].EnumLogFontEx.elfLogFont; - if (plf1->lfCharSet != plf2->lfCharSet) - continue; - - pFullName2 = Info[i].EnumLogFontEx.elfFullName; - if (_wcsicmp(pFullName1, pFullName2) != 0) - continue; - - return TRUE; - } - return FALSE; -} - static BOOLEAN FASTCALL GetFontFamilyInfoForList(LPLOGFONTW LogFont, PFONTFAMILYINFO Info, + LPCWSTR NominalName, DWORD *pCount, DWORD MaxCount, PLIST_ENTRY Head) @@ -2824,28 +2700,38 @@ GetFontFamilyInfoForList(LPLOGFONTW LogFont, { if (Count < MaxCount) { - FontFamilyFillInfo(&Info[Count], NULL, NULL, FontGDI); + FontFamilyFillInfo(&Info[Count], NominalName, NULL, FontGDI); } Count++; continue; } - FontFamilyFillInfo(&InfoEntry, NULL, NULL, FontGDI); + FontFamilyFillInfo(&InfoEntry, NominalName, NULL, FontGDI); - if (_wcsnicmp(LogFont->lfFaceName, InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, RTL_NUMBER_OF(LogFont->lfFaceName)-1) != 0 && - _wcsnicmp(LogFont->lfFaceName, InfoEntry.EnumLogFontEx.elfFullName, RTL_NUMBER_OF(LogFont->lfFaceName)-1) != 0) + if (NominalName) { - continue; + RtlStringCchCopyW(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, + RTL_NUMBER_OF(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName), + NominalName); } - - if (!FontFamilyFound(&InfoEntry, Info, min(Count, MaxCount))) + else { - if (Count < MaxCount) + if (_wcsnicmp(LogFont->lfFaceName, + InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, + RTL_NUMBER_OF(LogFont->lfFaceName) - 1) != 0 && + _wcsnicmp(LogFont->lfFaceName, + InfoEntry.EnumLogFontEx.elfFullName, + RTL_NUMBER_OF(LogFont->lfFaceName) - 1) != 0) { - RtlCopyMemory(&Info[Count], &InfoEntry, sizeof(InfoEntry)); + continue; } - Count++; } + + if (Count < MaxCount) + { + RtlCopyMemory(&Info[Count], &InfoEntry, sizeof(InfoEntry)); + } + Count++; } *pCount = Count; @@ -2861,10 +2747,9 @@ GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, { PLIST_ENTRY pEntry, pHead = &g_FontSubstListHead; PFONTSUBST_ENTRY pCurrentEntry; - PUNICODE_STRING pFromW; - FONTGDI *FontGDI; + PUNICODE_STRING pFromW, pToW; LOGFONTW lf = *LogFont; - UNICODE_STRING NameW; + PPROCESSINFO Win32Process = PsGetCurrentProcessWin32Process(); for (pEntry = pHead->Flink; pEntry != pHead; pEntry = pEntry->Flink) { @@ -2873,25 +2758,32 @@ GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, pFromW = &pCurrentEntry->FontNames[FONTSUBST_FROM]; if (LogFont->lfFaceName[0] != UNICODE_NULL) { - if (!FontFamilyInclude(LogFont, pFromW, Info, min(*pCount, MaxCount))) + if (_wcsicmp(LogFont->lfFaceName, pFromW->Buffer) != 0) continue; /* mismatch */ } + pToW = &pCurrentEntry->FontNames[FONTSUBST_TO]; + if (RtlEqualUnicodeString(pFromW, pToW, TRUE) && + pCurrentEntry->CharSets[FONTSUBST_FROM] == + pCurrentEntry->CharSets[FONTSUBST_TO]) + { + continue; + } + IntUnicodeStringToBuffer(lf.lfFaceName, sizeof(lf.lfFaceName), pFromW); SubstituteFontRecurse(&lf); + if (LogFont->lfCharSet != DEFAULT_CHARSET && LogFont->lfCharSet != lf.lfCharSet) + continue; - RtlInitUnicodeString(&NameW, lf.lfFaceName); - FontGDI = FindFaceNameInLists(&NameW); - if (FontGDI == NULL) - { - continue; /* no real font */ - } + IntLockGlobalFonts(); + GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount, &g_FontListHead); + IntUnLockGlobalFonts(); - if (*pCount < MaxCount) - { - FontFamilyFillInfo(&Info[*pCount], pFromW->Buffer, NULL, FontGDI); - } - (*pCount)++; + IntLockProcessPrivateFonts(Win32Process); + GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount, + &Win32Process->PrivateFontListHead); + IntUnLockProcessPrivateFonts(Win32Process); + break; } return TRUE; @@ -5534,7 +5426,7 @@ NtGdiGetFontFamilyInfo(HDC Dc, /* Enumerate font families in the global list */ IntLockGlobalFonts(); Count = 0; - if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, &g_FontListHead) ) + if (! GetFontFamilyInfoForList(&LogFont, Info, NULL, &Count, Size, &g_FontListHead) ) { IntUnLockGlobalFonts(); ExFreePoolWithTag(Info, GDITAG_TEXT); @@ -5545,7 +5437,7 @@ NtGdiGetFontFamilyInfo(HDC Dc, /* Enumerate font families in the process local list */ Win32Process = PsGetCurrentProcessWin32Process(); IntLockProcessPrivateFonts(Win32Process); - if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, + if (! GetFontFamilyInfoForList(&LogFont, Info, NULL, &Count, Size, &Win32Process->PrivateFontListHead)) { IntUnLockProcessPrivateFonts(Win32Process);

5 years, 8 months

[reactos] 01/01: [SETUPLIB][USETUP] Improve disk HW numbering, removable disk support, and "super-floppy" partitioning.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47a1acedf7b2825267421… commit 47a1acedf7b28252674211d12314755f7ba96be7 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Mar 12 00:13:25 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Mar 12 02:17:11 2019 +0100 [SETUPLIB][USETUP] Improve disk HW numbering, removable disk support, and "super-floppy" partitioning. Nowadays more and more people try to install ReactOS from removable drives (e.g. USB sticks) onto fixed HDDs, or try to install it into USB sticks too. Both fixed and removable drives, as well as partitions on these, are represented in NT using the same device name format: \Device\HarddiskM\PartitionN , with an increasing disk number M. Using this number for building the corresponding firmware-specific ARC multi(x)disk(y)rdisk(z) path used by the NT/ROS loader (FreeLdr, ...) is then prone to error since there may have been removable drives inserted and accounted for in the calculation of the disk number. These drives must be correctly subtracted in order to generate the correct ARC path, valid once all the removable drives have been ejected (which should also be the situation seen from the BIOS when booting up, except of course if you boot on a USB stick). This problem is now solved. Note that it matters only for the disks that have also been enumerated by the firmware (BIOS; Int 13h). We don't have to care about the other drives, since the ARC path will be of a different format and will not use the disk number (instead, the SCSI coordinates are used). We also try to enumerate all the disks found in all the possible disk adapters and controllers enumerated in the Hardware registry tree (and that are visible by FreeLdr) in order to cover all. Finally, we detect whether a disk reports as a "super-floppy", i.e. an unpartitioned disk with a valid VBR. This is indeed how a standard floppy disk looks like, or how USB sticks are partitioned on Windows. Such disk is reported has having only one single partition starting at the beginning of the disk, with partition number == 0, its type being FAT16 non-bootable. This allows us to forbid creating any new partitions on such disks. Note that accessing either \Device\HarddiskN\Partition0 or Partition1 on such a disk returns the same data. Note also that on the contrary, regular MBR-partitioned disks would report at least four partitions entries, instead of just one. The other improvements are: - Do *NOT* write any MBR on a disk partitioned as "super-floppy". CORE-13703 - Fix the computed disk identifier, of format: %08x-%08x-%c . The numbers are respectively the checksum of the first sector, and the disk signature. The terminating letter is A or X, depending whether the first sector ends with 0x55AA/0xAA55 or not (see also commit 5053f1f5). - Warn if the user attempts to install ReactOS on a disk that is not visible by the firmware of his computer, because it may not be bootable. --- base/setup/lib/setuplib.c | 60 +++++++-- base/setup/lib/utils/partlist.c | 277 ++++++++++++++++++++++++++++++++++------ base/setup/lib/utils/partlist.h | 40 +++--- base/setup/reactos/drivepage.c | 3 +- base/setup/usetup/usetup.c | 42 ++++-- 5 files changed, 346 insertions(+), 76 deletions(-) diff --git a/base/setup/lib/setuplib.c b/base/setup/lib/setuplib.c index fff627215b7..be71e8191c0 100644 --- a/base/setup/lib/setuplib.c +++ b/base/setup/lib/setuplib.c @@ -662,10 +662,54 @@ InitDestinationPaths( /** Equivalent of 'NTOS_INSTALLATION::SystemArcPath' **/ /* Create 'pSetupData->DestinationArcPath' */ RtlFreeUnicodeString(&pSetupData->DestinationArcPath); - Status = RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), - L"multi(0)disk(0)rdisk(%lu)partition(%lu)\\", - DiskEntry->BiosDiskNumber, - PartEntry->OnDiskPartitionNumber); + + if (DiskEntry->MediaType == FixedMedia) + { + if (DiskEntry->BiosFound) + { +#if 1 + Status = RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"multi(0)disk(0)rdisk(%lu)partition(%lu)\\", + DiskEntry->HwFixedDiskNumber, + PartEntry->OnDiskPartitionNumber); +#else + Status = RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"multi(%lu)disk(%lu)rdisk(%lu)partition(%lu)\\", + DiskEntry->HwAdapterNumber, + DiskEntry->HwControllerNumber, + DiskEntry->HwFixedDiskNumber, + PartEntry->OnDiskPartitionNumber); +#endif + DPRINT1("Fixed disk found by BIOS, using MULTI ARC path '%S'\n", PathBuffer); + } + else + { + Status = RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"scsi(%u)disk(%u)rdisk(%u)partition(%lu)\\", + DiskEntry->Port, + DiskEntry->Bus, + DiskEntry->Id, + PartEntry->OnDiskPartitionNumber); + DPRINT1("Fixed disk not found by BIOS, using SCSI ARC path '%S'\n", PathBuffer); + } + } + else // if (DiskEntry->MediaType == RemovableMedia) + { +#if 1 + Status = RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"multi(0)disk(0)rdisk(%lu)partition(%lu)\\", + 0, 1); + DPRINT1("Removable disk, using MULTI ARC path '%S'\n", PathBuffer); +#else + Status = RtlStringCchPrintfW(PathBuffer, ARRAYSIZE(PathBuffer), + L"signature(%08x)disk(%u)rdisk(%u)partition(%lu)\\", + DiskEntry->LayoutBuffer->Signature, + DiskEntry->Bus, + DiskEntry->Id, + PartEntry->OnDiskPartitionNumber); + DPRINT1("Removable disk, using SIGNATURE ARC path '%S'\n", PathBuffer); +#endif + } if (!NT_SUCCESS(Status)) { @@ -701,8 +745,8 @@ InitDestinationPaths( if (!NT_SUCCESS(Status)) { DPRINT1("CombinePaths() failed with status 0x%08lx\n", Status); - RtlFreeUnicodeString(&pSetupData->DestinationRootPath); RtlFreeUnicodeString(&pSetupData->DestinationArcPath); + RtlFreeUnicodeString(&pSetupData->DestinationRootPath); return Status; } @@ -711,8 +755,8 @@ InitDestinationPaths( if (!NT_SUCCESS(Status)) { DPRINT1("RtlCreateUnicodeString() failed with status 0x%08lx\n", Status); - RtlFreeUnicodeString(&pSetupData->DestinationRootPath); RtlFreeUnicodeString(&pSetupData->DestinationArcPath); + RtlFreeUnicodeString(&pSetupData->DestinationRootPath); return Status; } @@ -723,9 +767,9 @@ InitDestinationPaths( if (!NT_SUCCESS(Status)) { DPRINT1("RtlCreateUnicodeString() failed with status 0x%08lx\n", Status); - RtlFreeUnicodeString(&pSetupData->DestinationRootPath); - RtlFreeUnicodeString(&pSetupData->DestinationArcPath); RtlFreeUnicodeString(&pSetupData->DestinationPath); + RtlFreeUnicodeString(&pSetupData->DestinationArcPath); + RtlFreeUnicodeString(&pSetupData->DestinationRootPath); return Status; } diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c index 90dfe7ca8de..1930748ab80 100644 --- a/base/setup/lib/utils/partlist.c +++ b/base/setup/lib/utils/partlist.c @@ -404,7 +404,8 @@ DiskIdentifierQueryRoutine( UNICODE_STRING NameU; if (ValueType == REG_SZ && - ValueLength == 20 * sizeof(WCHAR)) + ValueLength == 20 * sizeof(WCHAR) && + ((PWCHAR)ValueData)[8] == L'-') { NameU.Buffer = (PWCHAR)ValueData; NameU.Length = NameU.MaximumLength = 8 * sizeof(WCHAR); @@ -517,6 +518,7 @@ EnumerateBiosDiskEntries( RTL_QUERY_REGISTRY_TABLE QueryTable[3]; WCHAR Name[120]; ULONG AdapterCount; + ULONG ControllerCount; ULONG DiskCount; NTSTATUS Status; PCM_INT13_DRIVE_PARAMETER Int13Drives; @@ -540,8 +542,7 @@ EnumerateBiosDiskEntries( return; } - AdapterCount = 0; - while (TRUE) + for (AdapterCount = 0; ; ++AdapterCount) { RtlStringCchPrintfW(Name, ARRAYSIZE(Name), L"%s\\%lu", @@ -566,11 +567,11 @@ EnumerateBiosDiskEntries( NULL); if (NT_SUCCESS(Status)) { - while (TRUE) + for (ControllerCount = 0; ; ++ControllerCount) { RtlStringCchPrintfW(Name, ARRAYSIZE(Name), - L"%s\\%lu\\DiskController\\0", - ROOT_NAME, AdapterCount); + L"%s\\%lu\\DiskController\\%lu", + ROOT_NAME, AdapterCount, ControllerCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -583,8 +584,8 @@ EnumerateBiosDiskEntries( } RtlStringCchPrintfW(Name, ARRAYSIZE(Name), - L"%s\\%lu\\DiskController\\0\\DiskPeripheral", - ROOT_NAME, AdapterCount); + L"%s\\%lu\\DiskController\\%lu\\DiskPeripheral", + ROOT_NAME, AdapterCount, ControllerCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, &QueryTable[2], @@ -597,18 +598,18 @@ EnumerateBiosDiskEntries( QueryTable[1].Name = L"Configuration Data"; QueryTable[1].QueryRoutine = DiskConfigurationDataQueryRoutine; - DiskCount = 0; - while (TRUE) + for (DiskCount = 0; ; ++DiskCount) { BiosDiskEntry = (BIOSDISKENTRY*)RtlAllocateHeap(ProcessHeap, HEAP_ZERO_MEMORY, sizeof(BIOSDISKENTRY)); if (BiosDiskEntry == NULL) { - break; + RtlFreeHeap(ProcessHeap, 0, Int13Drives); + return; } RtlStringCchPrintfW(Name, ARRAYSIZE(Name), - L"%s\\%lu\\DiskController\\0\\DiskPeripheral\\%lu", - ROOT_NAME, AdapterCount, DiskCount); + L"%s\\%lu\\DiskController\\%lu\\DiskPeripheral\\%lu", + ROOT_NAME, AdapterCount, ControllerCount, DiskCount); Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE, Name, QueryTable, @@ -617,11 +618,14 @@ EnumerateBiosDiskEntries( if (!NT_SUCCESS(Status)) { RtlFreeHeap(ProcessHeap, 0, BiosDiskEntry); - break; + RtlFreeHeap(ProcessHeap, 0, Int13Drives); + return; } + BiosDiskEntry->AdapterNumber = 0; // And NOT "AdapterCount" as it needs to be hardcoded for BIOS! + BiosDiskEntry->ControllerNumber = ControllerCount; BiosDiskEntry->DiskNumber = DiskCount; - BiosDiskEntry->Recognized = FALSE; + BiosDiskEntry->DiskEntry = NULL; if (DiskCount < Int13Drives[0].NumberDrives) { @@ -629,11 +633,14 @@ EnumerateBiosDiskEntries( } else { - DPRINT1("Didn't find int13 drive datas for disk %u\n", DiskCount); + DPRINT1("Didn't find Int13 drive data for disk %u\n", DiskCount); } InsertTailList(&PartList->BiosDiskListHead, &BiosDiskEntry->ListEntry); + DPRINT("--->\n"); + DPRINT("AdapterNumber: %lu\n", BiosDiskEntry->AdapterNumber); + DPRINT("ControllerNumber: %lu\n", BiosDiskEntry->ControllerNumber); DPRINT("DiskNumber: %lu\n", BiosDiskEntry->DiskNumber); DPRINT("Signature: %08lx\n", BiosDiskEntry->Signature); DPRINT("Checksum: %08lx\n", BiosDiskEntry->Checksum); @@ -645,17 +652,11 @@ EnumerateBiosDiskEntries( DPRINT("SectorsPerTrack: %d\n", BiosDiskEntry->Int13DiskData.SectorsPerTrack); DPRINT("MaxHeads: %d\n", BiosDiskEntry->Int13DiskData.MaxHeads); DPRINT("NumberDrives: %d\n", BiosDiskEntry->Int13DiskData.NumberDrives); - - DiskCount++; + DPRINT("<---\n"); } } - - RtlFreeHeap(ProcessHeap, 0, Int13Drives); - return; } } - - AdapterCount++; } RtlFreeHeap(ProcessHeap, 0, Int13Drives); @@ -664,6 +665,81 @@ EnumerateBiosDiskEntries( } +/* + * Detects whether a disk reports as a "super-floppy", i.e. an unpartitioned + * disk with a valid VBR, following the criteria used by IoReadPartitionTable() + * and IoWritePartitionTable(): + * only one single partition starting at the beginning of the disk; the reported + * defaults are: partition number being zero and its type being FAT16 non-bootable. + * Note also that accessing \Device\HarddiskN\Partition0 or Partition1 returns + * the same data. + */ +// static +BOOLEAN +IsSuperFloppy( + IN PDISKENTRY DiskEntry) +{ + PPARTITION_INFORMATION PartitionInfo; + ULONGLONG PartitionLengthEstimate; + + /* No layout buffer: we cannot say anything yet */ + if (DiskEntry->LayoutBuffer == NULL) + return FALSE; + + /* We must have only one partition */ + if (DiskEntry->LayoutBuffer->PartitionCount != 1) + return FALSE; + + /* Get the single partition entry */ + PartitionInfo = DiskEntry->LayoutBuffer->PartitionEntry; + + /* The single partition must start at the beginning of the disk */ + if (!(PartitionInfo->StartingOffset.QuadPart == 0 && + PartitionInfo->HiddenSectors == 0)) + { + return FALSE; + } + + /* The disk signature is usually set to one; warn in case it's not */ + if (DiskEntry->LayoutBuffer->Signature != 1) + { + DPRINT1("Super-Floppy disk %lu signature %08x != 1!\n", + DiskEntry->DiskNumber, DiskEntry->LayoutBuffer->Signature); + } + + /* + * The partition number must be zero or one, be recognized, + * have FAT16 type and report as non-bootable. + */ + if ((PartitionInfo->PartitionNumber != 0 && + PartitionInfo->PartitionNumber != 1) || + PartitionInfo->RecognizedPartition != TRUE || + PartitionInfo->PartitionType != PARTITION_FAT_16 || + PartitionInfo->BootIndicator != FALSE) + { + DPRINT1("Super-Floppy disk %lu does not return default settings!\n" + " PartitionNumber = %lu, expected 0\n" + " RecognizedPartition = %s, expected TRUE\n" + " PartitionType = 0x%02x, expected 0x04 (PARTITION_FAT_16)\n" + " BootIndicator = %s, expected FALSE\n", + DiskEntry->DiskNumber, + PartitionInfo->PartitionNumber, + PartitionInfo->RecognizedPartition ? "TRUE" : "FALSE", + PartitionInfo->PartitionType, + PartitionInfo->BootIndicator ? "TRUE" : "FALSE"); + } + + /* The partition lengths should agree */ + PartitionLengthEstimate = DiskEntry->SectorCount.QuadPart * DiskEntry->BytesPerSector; + if (PartitionInfo->PartitionLength.QuadPart != PartitionLengthEstimate) + { + DPRINT1("PartitionLength = %I64u is different from PartitionLengthEstimate = %I64u\n", + PartitionInfo->PartitionLength.QuadPart, PartitionLengthEstimate); + } + + return TRUE; +} + /* * Inserts the disk region represented by PartEntry into either the primary @@ -1293,6 +1369,67 @@ UpdateDiskSignatures( } } +static +VOID +UpdateHwDiskNumbers( + IN PPARTLIST List) +{ + PLIST_ENTRY ListEntry; + PBIOSDISKENTRY BiosDiskEntry; + PDISKENTRY DiskEntry; + ULONG HwAdapterNumber = 0; + ULONG HwControllerNumber = 0; + ULONG RemovableDiskCount = 0; + + /* + * Enumerate the disks recognized by the BIOS and recompute the disk + * numbers on the system when *ALL* removable disks are not connected. + * The entries are inserted in increasing order of AdapterNumber, + * ControllerNumber and DiskNumber. + */ + for (ListEntry = List->BiosDiskListHead.Flink; + ListEntry != &List->BiosDiskListHead; + ListEntry = ListEntry->Flink) + { + BiosDiskEntry = CONTAINING_RECORD(ListEntry, BIOSDISKENTRY, ListEntry); + DiskEntry = BiosDiskEntry->DiskEntry; + + /* + * If the adapter or controller numbers change, update them and reset + * the number of removable disks on this adapter/controller. + */ + if (HwAdapterNumber != BiosDiskEntry->AdapterNumber || + HwControllerNumber != BiosDiskEntry->ControllerNumber) + { + HwAdapterNumber = BiosDiskEntry->AdapterNumber; + HwControllerNumber = BiosDiskEntry->ControllerNumber; + RemovableDiskCount = 0; + } + + /* Adjust the actual hardware disk number */ + if (DiskEntry) + { + ASSERT(DiskEntry->HwDiskNumber == BiosDiskEntry->DiskNumber); + + if (DiskEntry->MediaType == RemovableMedia) + { + /* Increase the number of removable disks and set the disk number to zero */ + ++RemovableDiskCount; + DiskEntry->HwFixedDiskNumber = 0; + } + else // if (DiskEntry->MediaType == FixedMedia) + { + /* Adjust the fixed disk number, offset by the number of removable disks found before this one */ + DiskEntry->HwFixedDiskNumber = BiosDiskEntry->DiskNumber - RemovableDiskCount; + } + } + else + { + DPRINT1("BIOS disk %lu is not recognized by NTOS!\n", BiosDiskEntry->DiskNumber); + } + } +} + static VOID AddDiskToList( @@ -1394,7 +1531,9 @@ AddDiskToList( Checksum = ~Checksum + 1; RtlStringCchPrintfW(Identifier, ARRAYSIZE(Identifier), - L"%08x-%08x-A", Checksum, Signature); + L"%08x-%08x-%c", + Checksum, Signature, + (Mbr->Magic == PARTITION_MAGIC) ? L'A' : L'X'); DPRINT("Identifier: %S\n", Identifier); DiskEntry = RtlAllocateHeap(ProcessHeap, @@ -1409,6 +1548,37 @@ AddDiskToList( DiskEntry->PartList = List; +#if 0 + { + FILE_FS_DEVICE_INFORMATION FileFsDevice; + + /* Query the device for its type */ + Status = NtQueryVolumeInformationFile(FileHandle, + &Iosb, + &FileFsDevice, + sizeof(FileFsDevice), + FileFsDeviceInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Couldn't detect device type for disk %lu of identifier '%S'...\n", DiskNumber, Identifier); + } + else + { + DPRINT1("Disk %lu : DeviceType: 0x%08x ; Characteristics: 0x%08x\n", DiskNumber, FileFsDevice.DeviceType, FileFsDevice.Characteristics); + } + } + // NOTE: We may also use NtQueryVolumeInformationFile(FileFsDeviceInformation). +#endif + DiskEntry->MediaType = DiskGeometry.MediaType; + if (DiskEntry->MediaType == RemovableMedia) + { + DPRINT1("Disk %lu of identifier '%S' is removable\n", DiskNumber, Identifier); + } + else // if (DiskEntry->MediaType == FixedMedia) + { + DPRINT1("Disk %lu of identifier '%S' is fixed\n", DiskNumber, Identifier); + } + // DiskEntry->Checksum = Checksum; // DiskEntry->Signature = Signature; DiskEntry->BiosFound = FALSE; @@ -1459,34 +1629,42 @@ AddDiskToList( */ if (BiosDiskEntry->Signature == Signature && BiosDiskEntry->Checksum == Checksum && - !BiosDiskEntry->Recognized) + BiosDiskEntry->DiskEntry == NULL) { if (!DiskEntry->BiosFound) { - DiskEntry->BiosDiskNumber = BiosDiskEntry->DiskNumber; + DiskEntry->HwAdapterNumber = BiosDiskEntry->AdapterNumber; + DiskEntry->HwControllerNumber = BiosDiskEntry->ControllerNumber; + DiskEntry->HwDiskNumber = BiosDiskEntry->DiskNumber; + + if (DiskEntry->MediaType == RemovableMedia) + { + /* Set the removable disk number to zero */ + DiskEntry->HwFixedDiskNumber = 0; + } + else // if (DiskEntry->MediaType == FixedMedia) + { + /* The fixed disk number will later be adjusted using the number of removable disks */ + DiskEntry->HwFixedDiskNumber = BiosDiskEntry->DiskNumber; + } + DiskEntry->BiosFound = TRUE; - BiosDiskEntry->Recognized = TRUE; + BiosDiskEntry->DiskEntry = DiskEntry; + break; } else { // FIXME: What to do? + DPRINT1("Disk %lu of identifier '%S' has already been found?!\n", DiskNumber, Identifier); } } } if (!DiskEntry->BiosFound) { -#if 0 - RtlFreeHeap(ProcessHeap, 0, DiskEntry); - return; -#else - DPRINT1("WARNING: Setup could not find a matching BIOS disk entry. Disk %d is not be bootable by the BIOS!\n", DiskNumber); -#endif + DPRINT1("WARNING: Setup could not find a matching BIOS disk entry. Disk %lu may not be bootable by the BIOS!\n", DiskNumber); } - InitializeListHead(&DiskEntry->PrimaryPartListHead); - InitializeListHead(&DiskEntry->LogicalPartListHead); - DiskEntry->Cylinders = DiskGeometry.Cylinders.QuadPart; DiskEntry->TracksPerCylinder = DiskGeometry.TracksPerCylinder; DiskEntry->SectorsPerTrack = DiskGeometry.SectorsPerTrack; @@ -1530,6 +1708,9 @@ AddDiskToList( * See examples in https://git.reactos.org/?p=reactos.git;a=blob;f=reactos/ntoskrnl/io/iomgr/e… */ + InitializeListHead(&DiskEntry->PrimaryPartListHead); + InitializeListHead(&DiskEntry->LogicalPartListHead); + InsertAscendingList(&List->DiskListHead, DiskEntry, DISKENTRY, ListEntry, DiskNumber); @@ -1602,6 +1783,9 @@ AddDiskToList( DumpPartitionTable(DiskEntry); #endif + if (IsSuperFloppy(DiskEntry)) + DPRINT1("Disk %lu is a super-floppy\n", DiskNumber); + if (DiskEntry->LayoutBuffer->PartitionEntry[0].StartingOffset.QuadPart != 0 && DiskEntry->LayoutBuffer->PartitionEntry[0].PartitionLength.QuadPart != 0 && DiskEntry->LayoutBuffer->PartitionEntry[0].PartitionType != PARTITION_ENTRY_UNUSED) @@ -1723,7 +1907,7 @@ CreatePartitionList(VOID) } UpdateDiskSignatures(List); - + UpdateHwDiskNumbers(List); AssignDriveLetters(List); return List; @@ -1789,7 +1973,7 @@ DestroyPartitionList( PDISKENTRY GetDiskByBiosNumber( IN PPARTLIST List, - IN ULONG BiosDiskNumber) + IN ULONG HwDiskNumber) { PDISKENTRY DiskEntry; PLIST_ENTRY Entry; @@ -1801,7 +1985,7 @@ GetDiskByBiosNumber( { DiskEntry = CONTAINING_RECORD(Entry, DISKENTRY, ListEntry); - if (DiskEntry->BiosDiskNumber == BiosDiskNumber) + if (DiskEntry->HwDiskNumber == HwDiskNumber) { /* Disk found */ return DiskEntry; @@ -2879,6 +3063,7 @@ DeletePartition( if (List->SystemPartition == PartEntry) { ASSERT(List->SystemPartition); + ASSERT(List->SystemPartition->DiskEntry->MediaType != RemovableMedia); if (List->SystemPartition == List->OriginalSystemPartition) List->OriginalSystemPartition = NULL; @@ -3604,7 +3789,7 @@ WritePartitions( // // NOTE: Originally (see r40437), we used to install here also a new MBR // for this disk (by calling InstallMbrBootCodeToDisk), only if: - // DiskEntry->NewDisk == TRUE and DiskEntry->BiosDiskNumber == 0. + // DiskEntry->NewDisk == TRUE and DiskEntry->HwDiskNumber == 0. // Then after that, both DiskEntry->NewDisk and DiskEntry->NoMbr were set // to FALSE. In the other place (in usetup.c) where InstallMbrBootCodeToDisk // was called too, the installation test was modified by checking whether @@ -3823,6 +4008,10 @@ PrimaryPartitionCreationChecks( if (PartEntry->IsPartitioned) return ERROR_NEW_PARTITION; + /* Only one primary partition is allowed on super-floppy */ + if (IsSuperFloppy(DiskEntry)) + return ERROR_PARTITION_TABLE_FULL; + /* Fail if there are already 4 primary partitions in the list */ if (GetPrimaryPartitionCount(DiskEntry) >= 4) return ERROR_PARTITION_TABLE_FULL; @@ -3846,6 +4035,10 @@ ExtendedPartitionCreationChecks( if (PartEntry->IsPartitioned) return ERROR_NEW_PARTITION; + /* Only one primary partition is allowed on super-floppy */ + if (IsSuperFloppy(DiskEntry)) + return ERROR_PARTITION_TABLE_FULL; + /* Fail if there are already 4 primary partitions in the list */ if (GetPrimaryPartitionCount(DiskEntry) >= 4) return ERROR_PARTITION_TABLE_FULL; @@ -3873,6 +4066,10 @@ LogicalPartitionCreationChecks( if (PartEntry->IsPartitioned) return ERROR_NEW_PARTITION; + /* Only one primary partition is allowed on super-floppy */ + if (IsSuperFloppy(DiskEntry)) + return ERROR_PARTITION_TABLE_FULL; + return ERROR_SUCCESS; } diff --git a/base/setup/lib/utils/partlist.h b/base/setup/lib/utils/partlist.h index 2ed7f583e8f..fc31cc13331 100644 --- a/base/setup/lib/utils/partlist.h +++ b/base/setup/lib/utils/partlist.h @@ -72,19 +72,6 @@ typedef struct _PARTENTRY } PARTENTRY, *PPARTENTRY; - -typedef struct _BIOSDISKENTRY -{ - LIST_ENTRY ListEntry; - ULONG DiskNumber; - ULONG Signature; - ULONG Checksum; - BOOLEAN Recognized; - CM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; - CM_INT13_DRIVE_PARAMETER Int13DiskData; -} BIOSDISKENTRY, *PBIOSDISKENTRY; - - typedef struct _DISKENTRY { LIST_ENTRY ListEntry; @@ -92,6 +79,8 @@ typedef struct _DISKENTRY /* The list of disks/partitions this disk belongs to */ struct _PARTLIST *PartList; + MEDIA_TYPE MediaType; /* FixedMedia or RemovableMedia */ + /* Disk geometry */ ULONGLONG Cylinders; @@ -103,9 +92,12 @@ typedef struct _DISKENTRY ULONG SectorAlignment; ULONG CylinderAlignment; - /* BIOS parameters */ + /* BIOS Firmware parameters */ BOOLEAN BiosFound; - ULONG BiosDiskNumber; + ULONG HwAdapterNumber; + ULONG HwControllerNumber; + ULONG HwDiskNumber; /* Disk number currently assigned on the system */ + ULONG HwFixedDiskNumber; /* Disk number on the system when *ALL* removable disks are not connected */ // ULONG Signature; // Obtained from LayoutBuffer->Signature // ULONG Checksum; @@ -138,6 +130,18 @@ typedef struct _DISKENTRY } DISKENTRY, *PDISKENTRY; +typedef struct _BIOSDISKENTRY +{ + LIST_ENTRY ListEntry; + ULONG AdapterNumber; + ULONG ControllerNumber; + ULONG DiskNumber; + ULONG Signature; + ULONG Checksum; + PDISKENTRY DiskEntry; /* Corresponding recognized disk; is NULL if the disk is not recognized */ // RecognizedDiskEntry; + CM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; + CM_INT13_DRIVE_PARAMETER Int13DiskData; +} BIOSDISKENTRY, *PBIOSDISKENTRY; typedef struct _PARTLIST { @@ -223,6 +227,10 @@ RoundingDivide( IN ULONGLONG Divisor); +BOOLEAN +IsSuperFloppy( + IN PDISKENTRY DiskEntry); + PPARTLIST CreatePartitionList(VOID); @@ -234,7 +242,7 @@ DestroyPartitionList( PDISKENTRY GetDiskByBiosNumber( IN PPARTLIST List, - IN ULONG BiosDiskNumber); + IN ULONG HwDiskNumber); PDISKENTRY GetDiskByNumber( diff --git a/base/setup/reactos/drivepage.c b/base/setup/reactos/drivepage.c index 216f887659d..65ad2b927ba 100644 --- a/base/setup/reactos/drivepage.c +++ b/base/setup/reactos/drivepage.c @@ -791,7 +791,8 @@ DisableWizNext: DISKENTRY DiskEntry; PARTENTRY PartEntry; DiskEntry.DiskNumber = 0; - DiskEntry.BiosDiskNumber = 0; + DiskEntry.HwDiskNumber = 0; + DiskEntry.HwFixedDiskNumber = 0; PartEntry.DiskEntry = &DiskEntry; PartEntry.PartitionNumber = 1; // 4; /****/ diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c index 43673613a37..82716f61b5b 100644 --- a/base/setup/usetup/usetup.c +++ b/base/setup/usetup/usetup.c @@ -1636,6 +1636,23 @@ SelectPartitionPage(PINPUT_RECORD Ir) if (IsContainerPartition(CurrentPartition->PartitionType)) continue; // return SELECT_PARTITION_PAGE; + /* + * Check whether the user wants to install ReactOS on a disk that + * is not recognized by the computer's firmware and if so, display + * a warning since such disks may not be bootable. + */ + if (CurrentPartition->DiskEntry->MediaType == FixedMedia && + !CurrentPartition->DiskEntry->BiosFound) + { + PopupError("The disk you have selected for installing ReactOS\n" + "is not visible by the firmware of your computer,\n" + "and so may not be bootable.\n" + "Press ENTER to continue nonetheless.", + MUIGetString(STRING_CONTINUE), + Ir, POPUP_WAIT_ENTER); + // return SELECT_PARTITION_PAGE; + } + if (CurrentPartition->IsPartitioned == FALSE) { if (CurrentPartition->LogicalPartition) @@ -4428,18 +4445,21 @@ BootLoaderHarddiskMbrPage(PINPUT_RECORD Ir) return QUIT_PAGE; } - /* Step 2: Write the MBR */ - RtlStringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), - L"\\Device\\Harddisk%d\\Partition0", - PartitionList->SystemPartition->DiskEntry->DiskNumber); - Status = InstallMbrBootCodeToDisk(&USetupData.SystemRootPath, - &USetupData.SourceRootPath, - DestinationDevicePathBuffer); - if (!NT_SUCCESS(Status)) + /* Step 2: Write the MBR if the disk containing the system partition is not a super-floppy */ + if (!IsSuperFloppy(PartitionList->SystemPartition->DiskEntry)) { - DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", Status); - MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER, L"MBR"); - return QUIT_PAGE; + RtlStringCchPrintfW(DestinationDevicePathBuffer, ARRAYSIZE(DestinationDevicePathBuffer), + L"\\Device\\Harddisk%d\\Partition0", + PartitionList->SystemPartition->DiskEntry->DiskNumber); + Status = InstallMbrBootCodeToDisk(&USetupData.SystemRootPath, + &USetupData.SourceRootPath, + DestinationDevicePathBuffer); + if (!NT_SUCCESS(Status)) + { + DPRINT1("InstallMbrBootCodeToDisk() failed (Status %lx)\n", Status); + MUIDisplayError(ERROR_INSTALL_BOOTCODE, Ir, POPUP_WAIT_ENTER, L"MBR"); + return QUIT_PAGE; + } } return SUCCESS_PAGE;

5 years, 8 months

[reactos] 01/01: [NETAPI32] NetUserAdd, NetUserSetInfo: Start to set parm_err in case of invalid parameters.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85c5d035d918e3f914b63… commit 85c5d035d918e3f914b6347c8a69cebb1e2c97ba Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Mar 12 01:02:47 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Mar 12 01:02:47 2019 +0100 [NETAPI32] NetUserAdd, NetUserSetInfo: Start to set parm_err in case of invalid parameters. --- dll/win32/netapi32/netapi32.h | 1 + dll/win32/netapi32/user.c | 86 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 78 insertions(+), 9 deletions(-) diff --git a/dll/win32/netapi32/netapi32.h b/dll/win32/netapi32/netapi32.h index b2b8fe617aa..50b5255d6ad 100644 --- a/dll/win32/netapi32/netapi32.h +++ b/dll/win32/netapi32/netapi32.h @@ -3,6 +3,7 @@ #include <wine/config.h> +#include <limits.h> #include <stdarg.h> #define WIN32_NO_STATUS diff --git a/dll/win32/netapi32/user.c b/dll/win32/netapi32/user.c index d3bbf5b3bdc..1d2b8e299e1 100644 --- a/dll/win32/netapi32/user.c +++ b/dll/win32/netapi32/user.c @@ -1251,7 +1251,8 @@ static NET_API_STATUS SetUserInfo(SAM_HANDLE UserHandle, LPBYTE UserInfo, - DWORD Level) + DWORD Level, + PDWORD parm_err) { USER_ALL_INFORMATION UserAllInfo; PUSER_INFO_0 UserInfo0; @@ -1431,7 +1432,21 @@ SetUserInfo(SAM_HANDLE UserHandle, } UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; - // usri2_max_storage ignored + if (UserInfo2->usri2_max_storage != USER_MAXSTORAGE_UNLIMITED) + { + if (parm_err != NULL) + *parm_err = USER_MAX_STORAGE_PARMNUM; + ApiStatus = ERROR_INVALID_PARAMETER; + break; + } + + if (UserInfo2->usri2_units_per_week > USHRT_MAX) + { + if (parm_err != NULL) + *parm_err = USER_UNITS_PER_WEEK_PARMNUM; + ApiStatus = ERROR_INVALID_PARAMETER; + break; + } UserAllInfo.LogonHours.UnitsPerWeek = UserInfo2->usri2_units_per_week; UserAllInfo.LogonHours.LogonHours = UserInfo2->usri2_logon_hours; @@ -1534,7 +1549,21 @@ SetUserInfo(SAM_HANDLE UserHandle, } UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; - // usri3_max_storage ignored + if (UserInfo3->usri3_max_storage != USER_MAXSTORAGE_UNLIMITED) + { + if (parm_err != NULL) + *parm_err = USER_MAX_STORAGE_PARMNUM; + ApiStatus = ERROR_INVALID_PARAMETER; + break; + } + + if (UserInfo3->usri3_units_per_week > USHRT_MAX) + { + if (parm_err != NULL) + *parm_err = USER_UNITS_PER_WEEK_PARMNUM; + ApiStatus = ERROR_INVALID_PARAMETER; + break; + } UserAllInfo.LogonHours.UnitsPerWeek = UserInfo3->usri3_units_per_week; UserAllInfo.LogonHours.LogonHours = UserInfo3->usri3_logon_hours; @@ -1659,7 +1688,21 @@ SetUserInfo(SAM_HANDLE UserHandle, } UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; - // usri4_max_storage ignored + if (UserInfo4->usri4_max_storage != USER_MAXSTORAGE_UNLIMITED) + { + if (parm_err != NULL) + *parm_err = USER_MAX_STORAGE_PARMNUM; + ApiStatus = ERROR_INVALID_PARAMETER; + break; + } + + if (UserInfo4->usri4_units_per_week > USHRT_MAX) + { + if (parm_err != NULL) + *parm_err = USER_UNITS_PER_WEEK_PARMNUM; + ApiStatus = ERROR_INVALID_PARAMETER; + break; + } UserAllInfo.LogonHours.UnitsPerWeek = UserInfo4->usri4_units_per_week; UserAllInfo.LogonHours.LogonHours = UserInfo4->usri4_logon_hours; @@ -1781,7 +1824,21 @@ SetUserInfo(SAM_HANDLE UserHandle, } UserAllInfo.WhichFields |= USER_ALL_ACCOUNTEXPIRES; - // usri22_max_storage ignored + if (UserInfo22->usri22_max_storage != USER_MAXSTORAGE_UNLIMITED) + { + if (parm_err != NULL) + *parm_err = USER_MAX_STORAGE_PARMNUM; + ApiStatus = ERROR_INVALID_PARAMETER; + break; + } + + if (UserInfo22->usri22_units_per_week > USHRT_MAX) + { + if (parm_err != NULL) + *parm_err = USER_UNITS_PER_WEEK_PARMNUM; + ApiStatus = ERROR_INVALID_PARAMETER; + break; + } UserAllInfo.LogonHours.UnitsPerWeek = UserInfo22->usri22_units_per_week; UserAllInfo.LogonHours.LogonHours = UserInfo22->usri22_logon_hours; @@ -1920,14 +1977,23 @@ SetUserInfo(SAM_HANDLE UserHandle, if (UserInfo1018->usri1018_max_storage != USER_MAXSTORAGE_UNLIMITED) { - // FIXME: Report error - return ERROR_INVALID_PARAMETER; + if (parm_err != NULL) + *parm_err = USER_MAX_STORAGE_PARMNUM; + ApiStatus = ERROR_INVALID_PARAMETER; } break; case 1020: UserInfo1020 = (PUSER_INFO_1020)UserInfo; + if (UserInfo1020->usri1020_units_per_week > USHRT_MAX) + { + if (parm_err != NULL) + *parm_err = USER_UNITS_PER_WEEK_PARMNUM; + ApiStatus = ERROR_INVALID_PARAMETER; + break; + } + UserAllInfo.LogonHours.UnitsPerWeek = UserInfo1020->usri1020_units_per_week; UserAllInfo.LogonHours.LogonHours = UserInfo1020->usri1020_logon_hours; UserAllInfo.WhichFields |= USER_ALL_LOGONHOURS; @@ -2140,7 +2206,8 @@ NetUserAdd(LPCWSTR servername, /* Set user information */ ApiStatus = SetUserInfo(UserHandle, bufptr, - level); + level, + parm_err); if (ApiStatus != NERR_Success) { ERR("SetUserInfo failed (Status %lu)\n", ApiStatus); @@ -3720,7 +3787,8 @@ NetUserSetInfo(LPCWSTR servername, /* Set user information */ ApiStatus = SetUserInfo(UserHandle, buf, - level); + level, + parm_err); if (ApiStatus != NERR_Success) { ERR("SetUserInfo failed (Status %lu)\n", ApiStatus);

5 years, 8 months

[reactos] 01/01: [NETAPI32] NetUserSetInfo: Support the logon hours for level 2, 3, 4, 22 and 1020. Also make sure that we do not leak memory on invalid levels.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33eb43d6e73ca70f40d87… commit 33eb43d6e73ca70f40d87286e171637bf83b204e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Mar 12 00:20:07 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Mar 12 00:20:07 2019 +0100 [NETAPI32] NetUserSetInfo: Support the logon hours for level 2, 3, 4, 22 and 1020. Also make sure that we do not leak memory on invalid levels. --- dll/win32/netapi32/user.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/dll/win32/netapi32/user.c b/dll/win32/netapi32/user.c index 0ac1cf32085..d3bbf5b3bdc 100644 --- a/dll/win32/netapi32/user.c +++ b/dll/win32/netapi32/user.c @@ -1271,6 +1271,7 @@ SetUserInfo(SAM_HANDLE UserHandle, PUSER_INFO_1014 UserInfo1014; PUSER_INFO_1017 UserInfo1017; PUSER_INFO_1018 UserInfo1018; + PUSER_INFO_1020 UserInfo1020; PUSER_INFO_1024 UserInfo1024; PUSER_INFO_1025 UserInfo1025; PUSER_INFO_1051 UserInfo1051; @@ -1432,8 +1433,9 @@ SetUserInfo(SAM_HANDLE UserHandle, // usri2_max_storage ignored -// UserInfo2->usri2_units_per_week; -// UserInfo2->usri2_logon_hours; + UserAllInfo.LogonHours.UnitsPerWeek = UserInfo2->usri2_units_per_week; + UserAllInfo.LogonHours.LogonHours = UserInfo2->usri2_logon_hours; + UserAllInfo.WhichFields |= USER_ALL_LOGONHOURS; // usri2_bad_pw_count ignored // usri2_num_logons ignored @@ -1534,8 +1536,9 @@ SetUserInfo(SAM_HANDLE UserHandle, // usri3_max_storage ignored -// UserInfo3->usri3_units_per_week; -// UserInfo3->usri3_logon_hours; + UserAllInfo.LogonHours.UnitsPerWeek = UserInfo3->usri3_units_per_week; + UserAllInfo.LogonHours.LogonHours = UserInfo3->usri3_logon_hours; + UserAllInfo.WhichFields |= USER_ALL_LOGONHOURS; // usri3_bad_pw_count ignored // usri3_num_logons ignored @@ -1658,8 +1661,9 @@ SetUserInfo(SAM_HANDLE UserHandle, // usri4_max_storage ignored -// UserInfo4->usri4_units_per_week; -// UserInfo4->usri4_logon_hours; + UserAllInfo.LogonHours.UnitsPerWeek = UserInfo4->usri4_units_per_week; + UserAllInfo.LogonHours.LogonHours = UserInfo4->usri4_logon_hours; + UserAllInfo.WhichFields |= USER_ALL_LOGONHOURS; // usri4_bad_pw_count ignored // usri4_num_logons ignored @@ -1779,8 +1783,9 @@ SetUserInfo(SAM_HANDLE UserHandle, // usri22_max_storage ignored -// UserInfo22->usri22_units_per_week; -// UserInfo22->usri22_logon_hours; + UserAllInfo.LogonHours.UnitsPerWeek = UserInfo22->usri22_units_per_week; + UserAllInfo.LogonHours.LogonHours = UserInfo22->usri22_logon_hours; + UserAllInfo.WhichFields |= USER_ALL_LOGONHOURS; // usri22_bad_pw_count ignored // usri22_num_logons ignored @@ -1920,8 +1925,13 @@ SetUserInfo(SAM_HANDLE UserHandle, } break; -// case 1020: -// break; + case 1020: + UserInfo1020 = (PUSER_INFO_1020)UserInfo; + + UserAllInfo.LogonHours.UnitsPerWeek = UserInfo1020->usri1020_units_per_week; + UserAllInfo.LogonHours.LogonHours = UserInfo1020->usri1020_logon_hours; + UserAllInfo.WhichFields |= USER_ALL_LOGONHOURS; + break; case 1024: UserInfo1024 = (PUSER_INFO_1024)UserInfo; @@ -1965,12 +1975,11 @@ SetUserInfo(SAM_HANDLE UserHandle, UserAllInfo.WhichFields |= USER_ALL_HOMEDIRECTORYDRIVE; } break; - - default: - ERR("Unsupported level %lu!\n", Level); - return ERROR_INVALID_PARAMETER; } + if (ApiStatus != NERR_Success) + goto done; + Status = SamSetInformationUser(UserHandle, UserAllInformation, &UserAllInfo); @@ -3656,7 +3665,7 @@ NetUserSetInfo(LPCWSTR servername, case 1014: case 1017: case 1018: -// case 1020: + case 1020: case 1024: case 1025: case 1051:

5 years, 8 months

[reactos] 01/01: [NETAPI32] NetUserGetInfo: Build and return the users SID for level 4 and 23.

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0425d866bf22d1037110f… commit 0425d866bf22d1037110fbbafddd5ee2e5e33142 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Mar 11 22:28:42 2019 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Mar 11 22:31:36 2019 +0100 [NETAPI32] NetUserGetInfo: Build and return the users SID for level 4 and 23. --- dll/win32/netapi32/netapi32.h | 6 +++++ dll/win32/netapi32/user.c | 62 ++++++++++++++++++++++++++++++++++--------- dll/win32/netapi32/utils.c | 30 +++++++++++++++++++++ 3 files changed, 85 insertions(+), 13 deletions(-) diff --git a/dll/win32/netapi32/netapi32.h b/dll/win32/netapi32/netapi32.h index 722e333e911..b2b8fe617aa 100644 --- a/dll/win32/netapi32/netapi32.h +++ b/dll/win32/netapi32/netapi32.h @@ -58,6 +58,12 @@ BuildSidFromSidAndRid(IN PSID SrcSid, IN ULONG RelativeId, OUT PSID *DestSid); +VOID +CopySidFromSidAndRid( + _Out_ PSID DstSid, + _In_ PSID SrcSid, + _In_ ULONG RelativeId); + /* wksta.c */ BOOL diff --git a/dll/win32/netapi32/user.c b/dll/win32/netapi32/user.c index 3e29bc48c64..0ac1cf32085 100644 --- a/dll/win32/netapi32/user.c +++ b/dll/win32/netapi32/user.c @@ -39,6 +39,7 @@ typedef struct _ENUM_CONTEXT SAM_HANDLE ServerHandle; SAM_HANDLE BuiltinDomainHandle; SAM_HANDLE AccountDomainHandle; + PSID AccountDomainSid; SAM_ENUMERATE_HANDLE EnumerationContext; PSAM_RID_ENUMERATION Buffer; @@ -400,6 +401,7 @@ FreeUserInfo(PUSER_ALL_INFORMATION UserInfo) static NET_API_STATUS BuildUserInfoBuffer(SAM_HANDLE UserHandle, + PSID AccountDomainSid, DWORD level, ULONG RelativeId, LPVOID *Buffer) @@ -508,7 +510,7 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle, if (UserInfo->LogonHours.UnitsPerWeek > 0) Size += (((ULONG)UserInfo->LogonHours.UnitsPerWeek) + 7) / 8; - /* FIXME: usri4_user_sid */ + Size += RtlLengthSid(AccountDomainSid) + sizeof(ULONG); break; case 10: @@ -547,7 +549,7 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle, UserInfo->FullName.Length + sizeof(WCHAR) + UserInfo->AdminComment.Length + sizeof(WCHAR); - /* FIXME: usri23_user_sid */ + Size += RtlLengthSid(AccountDomainSid) + sizeof(ULONG); break; default: @@ -993,7 +995,9 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle, UserInfo4->usri4_country_code = UserInfo->CountryCode; UserInfo4->usri4_code_page = UserInfo->CodePage; - /* FIXME: usri4_user_sid */ + UserInfo4->usri4_user_sid = (PVOID)Ptr; + CopySidFromSidAndRid(UserInfo4->usri4_user_sid, AccountDomainSid, RelativeId); + Ptr = (LPWSTR)((ULONG_PTR)Ptr + RtlLengthSid(AccountDomainSid) + sizeof(ULONG)); UserInfo4->usri4_primary_group_id = UserInfo->PrimaryGroupId; @@ -1216,7 +1220,9 @@ BuildUserInfoBuffer(SAM_HANDLE UserHandle, UserInfo23->usri23_flags = GetAccountFlags(UserInfo->UserAccountControl, Dacl); - /* FIXME: usri23_user_sid */ + UserInfo23->usri23_user_sid = (PVOID)Ptr; + CopySidFromSidAndRid(UserInfo23->usri23_user_sid, AccountDomainSid, RelativeId); + Ptr = (LPWSTR)((ULONG_PTR)Ptr + RtlLengthSid(AccountDomainSid) + sizeof(ULONG)); break; } @@ -2484,13 +2490,24 @@ NetUserEnum(LPCWSTR servername, goto done; } - Status = OpenAccountDomain(EnumContext->ServerHandle, - (servername != NULL) ? &ServerName : NULL, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, - &EnumContext->AccountDomainHandle); + /* Get the Account Domain SID */ + Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, + &EnumContext->AccountDomainSid); if (!NT_SUCCESS(Status)) { - ERR("OpenAccountDomain failed (Status %08lx)\n", Status); + ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + /* Open the Account Domain */ + Status = SamOpenDomain(EnumContext->ServerHandle, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + EnumContext->AccountDomainSid, + &EnumContext->AccountDomainHandle); + if (!NT_SUCCESS(Status)) + { + ERR("SamOpenDomain failed (Status %08lx)\n", Status); ApiStatus = NetpNtStatusToApiStatus(Status); goto done; } @@ -2567,6 +2584,7 @@ NetUserEnum(LPCWSTR servername, } ApiStatus = BuildUserInfoBuffer(UserHandle, + EnumContext->AccountDomainSid, level, CurrentUser->RelativeId, &Buffer); @@ -2601,6 +2619,9 @@ done: if (EnumContext->AccountDomainHandle != NULL) SamCloseHandle(EnumContext->AccountDomainHandle); + if (EnumContext->AccountDomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, EnumContext->AccountDomainSid); + if (EnumContext->ServerHandle != NULL) SamCloseHandle(EnumContext->ServerHandle); @@ -2816,6 +2837,7 @@ NetUserGetInfo(LPCWSTR servername, PULONG RelativeIds = NULL; PSID_NAME_USE Use = NULL; LPVOID Buffer = NULL; + PSID AccountDomainSid = NULL; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; @@ -2839,11 +2861,21 @@ NetUserGetInfo(LPCWSTR servername, goto done; } + /* Get the Account Domain SID */ + Status = GetAccountDomainSid((servername != NULL) ? &ServerName : NULL, + &AccountDomainSid); + if (!NT_SUCCESS(Status)) + { + ERR("GetAccountDomainSid failed (Status %08lx)\n", Status); + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + /* Open the Account Domain */ - Status = OpenAccountDomain(ServerHandle, - (servername != NULL) ? &ServerName : NULL, - DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, - &AccountDomainHandle); + Status = SamOpenDomain(ServerHandle, + DOMAIN_LIST_ACCOUNTS | DOMAIN_LOOKUP, + AccountDomainSid, + &AccountDomainHandle); if (!NT_SUCCESS(Status)) { ERR("OpenAccountDomain failed (Status %08lx)\n", Status); @@ -2890,6 +2922,7 @@ NetUserGetInfo(LPCWSTR servername, } ApiStatus = BuildUserInfoBuffer(UserHandle, + AccountDomainSid, level, RelativeIds[0], &Buffer); @@ -2912,6 +2945,9 @@ done: if (AccountDomainHandle != NULL) SamCloseHandle(AccountDomainHandle); + if (AccountDomainSid != NULL) + RtlFreeHeap(RtlGetProcessHeap(), 0, AccountDomainSid); + if (ServerHandle != NULL) SamCloseHandle(ServerHandle); diff --git a/dll/win32/netapi32/utils.c b/dll/win32/netapi32/utils.c index 125dbe7f89c..cbc2d4f700b 100644 --- a/dll/win32/netapi32/utils.c +++ b/dll/win32/netapi32/utils.c @@ -215,4 +215,34 @@ BuildSidFromSidAndRid(IN PSID SrcSid, return NERR_Success; } + +VOID +CopySidFromSidAndRid( + _Out_ PSID DstSid, + _In_ PSID SrcSid, + _In_ ULONG RelativeId) +{ + UCHAR RidCount; + ULONG i; + PULONG p, q; + + RidCount = *RtlSubAuthorityCountSid(SrcSid); + if (RidCount >= 8) + return; + + RtlInitializeSid(DstSid, + RtlIdentifierAuthoritySid(SrcSid), + RidCount + 1); + + for (i = 0; i < (ULONG)RidCount; i++) + { + p = RtlSubAuthoritySid(SrcSid, i); + q = RtlSubAuthoritySid(DstSid, i); + *q = *p; + } + + q = RtlSubAuthoritySid(DstSid, (ULONG)RidCount); + *q = RelativeId; +} + /* EOF */

5 years, 8 months

[reactos] 01/01: [FREETYPE] Fix 3 regressions in one patch

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98b7ecd280c0f641d4593… commit 98b7ecd280c0f641d4593c8ba792b463a5117550 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Mon Mar 11 20:10:14 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Mon Mar 11 20:10:14 2019 +0100 [FREETYPE] Fix 3 regressions in one patch Fixes regression CORE-15785 (Zim Desktop Wiki 0.67 crashed) and Fixes regression CORE-15755 (NLite 1.4.9.3 used wrong font) without reintroducing regression CORE-15558 (AbiWord 2.6.8 font enumeration) This is achieved by partial revert of 0.4.12-dev-320-g 6e4e5a004c9da6276695d90187fb577812e8892f and got ack of Katayama Hirofumi MZ. Thanks to patches author Doug Lyons. Test-results: https://reactos.org/testman/compare.php?ids=66264,66267 --- win32ss/gdi/ntgdi/freetype.c | 196 +++++++++++++++++++++++++++++++++---------- 1 file changed, 152 insertions(+), 44 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 7005057a077..4f58f030f27 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -2244,6 +2244,73 @@ IntGetOutlineTextMetrics(PFONTGDI FontGDI, return Cache->OutlineRequiredSize; } +static PFONTGDI FASTCALL +FindFaceNameInList(PUNICODE_STRING FaceName, PLIST_ENTRY Head) +{ + PLIST_ENTRY Entry; + PFONT_ENTRY CurrentEntry; + ANSI_STRING EntryFaceNameA; + UNICODE_STRING EntryFaceNameW; + FONTGDI *FontGDI; + NTSTATUS status; + + for (Entry = Head->Flink; Entry != Head; Entry = Entry->Flink) + { + CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry); + + FontGDI = CurrentEntry->Font; + ASSERT(FontGDI); + + RtlInitAnsiString(&EntryFaceNameA, FontGDI->SharedFace->Face->family_name); + status = RtlAnsiStringToUnicodeString(&EntryFaceNameW, &EntryFaceNameA, TRUE); + if (!NT_SUCCESS(status)) + { + break; + } + + if ((LF_FACESIZE - 1) * sizeof(WCHAR) < EntryFaceNameW.Length) + { + EntryFaceNameW.Length = (LF_FACESIZE - 1) * sizeof(WCHAR); + EntryFaceNameW.Buffer[LF_FACESIZE - 1] = L'\0'; + } + + if (RtlEqualUnicodeString(FaceName, &EntryFaceNameW, TRUE)) + { + RtlFreeUnicodeString(&EntryFaceNameW); + return FontGDI; + } + + RtlFreeUnicodeString(&EntryFaceNameW); + } + + return NULL; +} + +static PFONTGDI FASTCALL +FindFaceNameInLists(PUNICODE_STRING FaceName) +{ + PPROCESSINFO Win32Process; + PFONTGDI Font; + + /* Search the process local list. + We do not have to search the 'Mem' list, since those fonts are linked in the PrivateFontListHead */ + Win32Process = PsGetCurrentProcessWin32Process(); + IntLockProcessPrivateFonts(Win32Process); + Font = FindFaceNameInList(FaceName, &Win32Process->PrivateFontListHead); + IntUnLockProcessPrivateFonts(Win32Process); + if (NULL != Font) + { + return Font; + } + + /* Search the global list */ + IntLockGlobalFonts(); + Font = FindFaceNameInList(FaceName, &g_FontListHead); + IntUnLockGlobalFonts(); + + return Font; +} + /* See https://msdn.microsoft.com/en-us/library/bb165625(v=vs.90).aspx */ static BYTE CharSetFromLangID(LANGID LangID) @@ -2670,10 +2737,67 @@ FontFamilyFillInfo(PFONTFAMILYINFO Info, LPCWSTR FaceName, Info->NewTextMetricEx.ntmFontSig = fs; } +static int FASTCALL +FindFaceNameInInfo(PUNICODE_STRING FaceName, PFONTFAMILYINFO Info, DWORD InfoEntries) +{ + DWORD i; + UNICODE_STRING InfoFaceName; + + for (i = 0; i < InfoEntries; i++) + { + RtlInitUnicodeString(&InfoFaceName, Info[i].EnumLogFontEx.elfLogFont.lfFaceName); + if (RtlEqualUnicodeString(&InfoFaceName, FaceName, TRUE)) + { + return i; + } + } + + return -1; +} + +static BOOLEAN FASTCALL +FontFamilyInclude(LPLOGFONTW LogFont, PUNICODE_STRING FaceName, + PFONTFAMILYINFO Info, DWORD InfoEntries) +{ + UNICODE_STRING LogFontFaceName; + + RtlInitUnicodeString(&LogFontFaceName, LogFont->lfFaceName); + if (0 != LogFontFaceName.Length && + !RtlEqualUnicodeString(&LogFontFaceName, FaceName, TRUE)) + { + return FALSE; + } + + return FindFaceNameInInfo(FaceName, Info, InfoEntries) < 0; +} + +static BOOL FASTCALL +FontFamilyFound(PFONTFAMILYINFO InfoEntry, + PFONTFAMILYINFO Info, DWORD InfoCount) +{ + LPLOGFONTW plf1 = &InfoEntry->EnumLogFontEx.elfLogFont; + LPWSTR pFullName1 = InfoEntry->EnumLogFontEx.elfFullName; + LPWSTR pFullName2; + DWORD i; + + for (i = 0; i < InfoCount; ++i) + { + LPLOGFONTW plf2 = &Info[i].EnumLogFontEx.elfLogFont; + if (plf1->lfCharSet != plf2->lfCharSet) + continue; + + pFullName2 = Info[i].EnumLogFontEx.elfFullName; + if (_wcsicmp(pFullName1, pFullName2) != 0) + continue; + + return TRUE; + } + return FALSE; +} + static BOOLEAN FASTCALL GetFontFamilyInfoForList(LPLOGFONTW LogFont, PFONTFAMILYINFO Info, - LPCWSTR NominalName, DWORD *pCount, DWORD MaxCount, PLIST_ENTRY Head) @@ -2700,38 +2824,28 @@ GetFontFamilyInfoForList(LPLOGFONTW LogFont, { if (Count < MaxCount) { - FontFamilyFillInfo(&Info[Count], NominalName, NULL, FontGDI); + FontFamilyFillInfo(&Info[Count], NULL, NULL, FontGDI); } Count++; continue; } - FontFamilyFillInfo(&InfoEntry, NominalName, NULL, FontGDI); + FontFamilyFillInfo(&InfoEntry, NULL, NULL, FontGDI); - if (NominalName) + if (_wcsnicmp(LogFont->lfFaceName, InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, RTL_NUMBER_OF(LogFont->lfFaceName)-1) != 0 && + _wcsnicmp(LogFont->lfFaceName, InfoEntry.EnumLogFontEx.elfFullName, RTL_NUMBER_OF(LogFont->lfFaceName)-1) != 0) { - RtlStringCchCopyW(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, - RTL_NUMBER_OF(InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName), - NominalName); + continue; } - else + + if (!FontFamilyFound(&InfoEntry, Info, min(Count, MaxCount))) { - if (_wcsnicmp(LogFont->lfFaceName, - InfoEntry.EnumLogFontEx.elfLogFont.lfFaceName, - RTL_NUMBER_OF(LogFont->lfFaceName) - 1) != 0 && - _wcsnicmp(LogFont->lfFaceName, - InfoEntry.EnumLogFontEx.elfFullName, - RTL_NUMBER_OF(LogFont->lfFaceName) - 1) != 0) + if (Count < MaxCount) { - continue; + RtlCopyMemory(&Info[Count], &InfoEntry, sizeof(InfoEntry)); } + Count++; } - - if (Count < MaxCount) - { - RtlCopyMemory(&Info[Count], &InfoEntry, sizeof(InfoEntry)); - } - Count++; } *pCount = Count; @@ -2747,9 +2861,10 @@ GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, { PLIST_ENTRY pEntry, pHead = &g_FontSubstListHead; PFONTSUBST_ENTRY pCurrentEntry; - PUNICODE_STRING pFromW, pToW; + PUNICODE_STRING pFromW; + FONTGDI *FontGDI; LOGFONTW lf = *LogFont; - PPROCESSINFO Win32Process = PsGetCurrentProcessWin32Process(); + UNICODE_STRING NameW; for (pEntry = pHead->Flink; pEntry != pHead; pEntry = pEntry->Flink) { @@ -2758,32 +2873,25 @@ GetFontFamilyInfoForSubstitutes(LPLOGFONTW LogFont, pFromW = &pCurrentEntry->FontNames[FONTSUBST_FROM]; if (LogFont->lfFaceName[0] != UNICODE_NULL) { - if (_wcsicmp(LogFont->lfFaceName, pFromW->Buffer) != 0) + if (!FontFamilyInclude(LogFont, pFromW, Info, min(*pCount, MaxCount))) continue; /* mismatch */ } - pToW = &pCurrentEntry->FontNames[FONTSUBST_TO]; - if (RtlEqualUnicodeString(pFromW, pToW, TRUE) && - pCurrentEntry->CharSets[FONTSUBST_FROM] == - pCurrentEntry->CharSets[FONTSUBST_TO]) - { - continue; - } - IntUnicodeStringToBuffer(lf.lfFaceName, sizeof(lf.lfFaceName), pFromW); SubstituteFontRecurse(&lf); - if (LogFont->lfCharSet != DEFAULT_CHARSET && LogFont->lfCharSet != lf.lfCharSet) - continue; - IntLockGlobalFonts(); - GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount, &g_FontListHead); - IntUnLockGlobalFonts(); + RtlInitUnicodeString(&NameW, lf.lfFaceName); + FontGDI = FindFaceNameInLists(&NameW); + if (FontGDI == NULL) + { + continue; /* no real font */ + } - IntLockProcessPrivateFonts(Win32Process); - GetFontFamilyInfoForList(&lf, Info, pFromW->Buffer, pCount, MaxCount, - &Win32Process->PrivateFontListHead); - IntUnLockProcessPrivateFonts(Win32Process); - break; + if (*pCount < MaxCount) + { + FontFamilyFillInfo(&Info[*pCount], pFromW->Buffer, NULL, FontGDI); + } + (*pCount)++; } return TRUE; @@ -5426,7 +5534,7 @@ NtGdiGetFontFamilyInfo(HDC Dc, /* Enumerate font families in the global list */ IntLockGlobalFonts(); Count = 0; - if (! GetFontFamilyInfoForList(&LogFont, Info, NULL, &Count, Size, &g_FontListHead) ) + if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, &g_FontListHead) ) { IntUnLockGlobalFonts(); ExFreePoolWithTag(Info, GDITAG_TEXT); @@ -5437,7 +5545,7 @@ NtGdiGetFontFamilyInfo(HDC Dc, /* Enumerate font families in the process local list */ Win32Process = PsGetCurrentProcessWin32Process(); IntLockProcessPrivateFonts(Win32Process); - if (! GetFontFamilyInfoForList(&LogFont, Info, NULL, &Count, Size, + if (! GetFontFamilyInfoForList(&LogFont, Info, &Count, Size, &Win32Process->PrivateFontListHead)) { IntUnLockProcessPrivateFonts(Win32Process);

5 years, 8 months

← Newer
1
...
10
11
12
13
14
15
16
...
22
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 March 2019