Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [LSASRV] Improvements to LsapLogonUser()
by Eric Kohl 30 Jul '19

30 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=034c6fd0c56e6717f9756… commit 034c6fd0c56e6717f97568a08348cfaaa3f04e44 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Tue Jul 30 23:09:32 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Tue Jul 30 23:10:33 2019 +0200 [LSASRV] Improvements to LsapLogonUser() - Token handle duplication must be the last step because we cannot close the duplicated token handle if something fails. - Call LsaApLogonTerminated(), delete the logon session and free the profile buffer if something fails. --- dll/win32/lsasrv/authpackage.c | 55 ++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 21 deletions(-) diff --git a/dll/win32/lsasrv/authpackage.c b/dll/win32/lsasrv/authpackage.c index 6c8b47a954f..29bb465d80b 100644 --- a/dll/win32/lsasrv/authpackage.c +++ b/dll/win32/lsasrv/authpackage.c @@ -1641,22 +1641,6 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, goto done; } - /* Duplicate the token handle into the client process */ - Status = NtDuplicateObject(NtCurrentProcess(), - TokenHandle, - LogonContext->ClientProcessHandle, - &RequestMsg->LogonUser.Reply.Token, - 0, - 0, - DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES | DUPLICATE_CLOSE_SOURCE); - if (!NT_SUCCESS(Status)) - { - ERR("NtDuplicateObject failed (Status 0x%08lx)\n", Status); - goto done; - } - -// TokenHandle = NULL; - if (LogonType == Interactive || LogonType == Batch || LogonType == Service) @@ -1680,12 +1664,41 @@ LsapLogonUser(PLSA_API_MSG RequestMsg, goto done; } + /* + * Duplicate the token handle into the client process. + * This must be the last step because we cannot + * close the duplicated token handle in case something fails. + */ + Status = NtDuplicateObject(NtCurrentProcess(), + TokenHandle, + LogonContext->ClientProcessHandle, + &RequestMsg->LogonUser.Reply.Token, + 0, + 0, + DUPLICATE_SAME_ACCESS | DUPLICATE_SAME_ATTRIBUTES | DUPLICATE_CLOSE_SOURCE); + if (!NT_SUCCESS(Status)) + { + ERR("NtDuplicateObject failed (Status 0x%08lx)\n", Status); + goto done; + } + done: -// if (!NT_SUCCESS(Status)) -// { - if (TokenHandle != NULL) - NtClose(TokenHandle); -// } + if (!NT_SUCCESS(Status)) + { + /* Notify the authentification package of the failure */ + Package->LsaApLogonTerminated(&RequestMsg->LogonUser.Reply.LogonId); + + /* Delete the logon session */ + LsapDeleteLogonSession(&RequestMsg->LogonUser.Reply.LogonId); + + /* Release the profile buffer */ + LsapFreeClientBuffer((PLSA_CLIENT_REQUEST)LogonContext, + RequestMsg->LogonUser.Reply.ProfileBuffer); + RequestMsg->LogonUser.Reply.ProfileBuffer = NULL; + } + + if (TokenHandle != NULL) + NtClose(TokenHandle); /* Free the local groups */ if (LocalGroups != NULL)

1 0

[reactos] 01/01: [CONFIGURE] Add MSVC compiler 19.22.27905 (VS Community 2019) (#1774)
by Stanislav Motylkov 30 Jul '19

30 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5cff9163e99ec596f4cfc… commit 5cff9163e99ec596f4cfc47cc2fc380e8614f823 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Wed Jul 31 00:01:23 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jul 30 23:01:23 2019 +0200 [CONFIGURE] Add MSVC compiler 19.22.27905 (VS Community 2019) (#1774) --- configure.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.cmd b/configure.cmd index 4113375bfde..4509ff04231 100755 --- a/configure.cmd +++ b/configure.cmd @@ -75,6 +75,7 @@ if defined ROS_ARCH ( cl 2>&1 | find "19.16." > NUL && set VS_VERSION=15 cl 2>&1 | find "19.20." > NUL && set VS_VERSION=16 cl 2>&1 | find "19.21." > NUL && set VS_VERSION=16 + cl 2>&1 | find "19.22." > NUL && set VS_VERSION=16 if not defined VS_VERSION ( echo Error: Visual Studio version too old ^(before 10 ^(2010^)^) or version detection failed. goto quit

1 0

[reactos] 01/01: [SETUP] Sort font substitutes (#1770)
by Katayama Hirofumi MZ 30 Jul '19

30 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f054844f33a9d8927ea71… commit f054844f33a9d8927ea716a2a17d90c2c7e7c521 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 30 22:05:11 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 30 22:05:11 2019 +0900 [SETUP] Sort font substitutes (#1770) Sort the font substitute setting lists in base/setup/lib/muifonts.h . --- base/setup/lib/muifonts.h | 104 +++++++++++++++++++++++----------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 1cdb78ecece..150dee0e61b 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -8,21 +8,21 @@ MUI_SUBFONT LatinFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -33,21 +33,21 @@ MUI_SUBFONT CyrillicFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -58,21 +58,21 @@ MUI_SUBFONT GreekFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"DejaVu Sans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -83,21 +83,21 @@ MUI_SUBFONT HebrewFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Tahoma" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Tahoma" }, { L"MS Shell Dlg", L"Tahoma" }, { L"MS Shell Dlg 2", L"Tahoma" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"Tahoma" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"DejaVu Serif" }, { L"Times New Roman", L"DejaVu Serif" }, { L"Tms Rmn", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Tahoma" }, { NULL, NULL } }; @@ -114,27 +114,27 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, + { L"MS Song", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"NSimSun", L"Droid Sans Fallback" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"SimHei", L"Droid Sans Fallback" }, + { L"SimSun", L"Droid Sans Fallback" }, + { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"SimSun", L"Droid Sans Fallback" }, - { L"NSimSun", L"Droid Sans Fallback" }, - { L"SimHei", L"Droid Sans Fallback" }, - { L"MS Song", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { CSF_LocalName0, L"Droid Sans Fallback" }, @@ -154,7 +154,11 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"Arial", L"Liberation Sans" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, + { L"DLCMingBold", L"Droid Sans Fallback" }, + { L"DLCMingMedium", L"Droid Sans Fallback" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -163,21 +167,17 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Ming Light", L"Droid Sans Fallback" }, + { L"MingLiU", L"Droid Sans Fallback" }, + { L"PMingLiU", L"Droid Sans Fallback" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"Ming Light", L"Droid Sans Fallback" }, - { L"MingLiU", L"Droid Sans Fallback" }, - { L"PMingLiU", L"Droid Sans Fallback" }, - { L"DLCMingMedium", L"Droid Sans Fallback" }, - { L"DLCMingBold", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { CTF_LocalName0, L"Droid Sans Fallback" }, @@ -197,28 +197,28 @@ MUI_SUBFONT JapaneseFonts[] = { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, + { L"MS Gothic", L"Droid Sans Fallback" }, + { L"MS Mincho", L"Droid Sans Fallback" }, + { L"MS PGothic", L"Droid Sans Fallback" }, + { L"MS PMincho", L"Droid Sans Fallback" }, { L"MS Sans Serif", L"Droid Sans Fallback" }, { L"MS Shell Dlg", L"Droid Sans Fallback" }, { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"MS Mincho", L"Droid Sans Fallback" }, - { L"MS PMincho", L"Droid Sans Fallback" }, - { L"MS Gothic", L"Droid Sans Fallback" }, - { L"MS PGothic", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { JF_LocalName0, L"Droid Sans Fallback" }, @@ -237,9 +237,17 @@ WCHAR KF_LocalName5[] = {0xAD74, 0xB9BC, 0xCCB4, 0}; /* GulimChe */ MUI_SUBFONT KoreanFonts[] = { { L"Arial", L"Liberation Sans" }, + { L"Batang", L"Droid Sans Fallback" }, + { L"BatangChe", L"Droid Sans Fallback" }, { L"Courier", L"FreeMono" }, { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, + { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, + { L"Georgia", L"FreeSerif" }, + { L"Gulim", L"Droid Sans Fallback" }, + { L"GulimChe", L"Droid Sans Fallback" }, + { L"Gungsuh", L"Droid Sans Fallback" }, + { L"GungsuhChe", L"Droid Sans Fallback" }, { L"Helv", L"Droid Sans Fallback" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, @@ -248,22 +256,14 @@ MUI_SUBFONT KoreanFonts[] = { L"MS Shell Dlg 2", L"Droid Sans Fallback" }, { L"MS UI Gothic", L"Droid Sans Fallback" }, { L"MS UI Gothic 2", L"Droid Sans Fallback" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"Droid Sans Fallback" }, { L"Tahoma", L"Droid Sans Fallback" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Droid Sans Fallback" }, - { L"Batang", L"Droid Sans Fallback" }, - { L"BatangChe", L"Droid Sans Fallback" }, - { L"Gungsuh", L"Droid Sans Fallback" }, - { L"GungsuhChe", L"Droid Sans Fallback" }, - { L"Gulim", L"Droid Sans Fallback" }, - { L"GulimChe", L"Droid Sans Fallback" }, - { L"System", L"Droid Sans Fallback" }, - { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, /* localized names */ { KF_LocalName0, L"Droid Sans Fallback" }, @@ -282,21 +282,21 @@ MUI_SUBFONT UnicodeFonts[] = { L"Courier New", L"DejaVu Sans Mono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"DejaVu Sans" }, { L"Helvetica", L"DejaVu Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"DejaVu Sans" }, { L"MS Shell Dlg", L"DejaVu Sans" }, { L"MS Shell Dlg 2", L"DejaVu Sans" }, + { L"Palatino Linotype", L"DejaVu Serif" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"DejaVu Sans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"DejaVu Serif" }, { L"Times New Roman", L"DejaVu Serif" }, { L"Tms Rmn", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } }; @@ -308,20 +308,20 @@ MUI_SUBFONT HindiFonts[] = { L"Courier New", L"FreeMono" }, { L"Fixedsys", L"Fixedsys Excelsior 3.01-L2" }, { L"Franklin Gothic Medium", L"Libre Franklin Bold" }, + { L"Georgia", L"FreeSerif" }, { L"Helv", L"Tahoma" }, { L"Helvetica", L"Liberation Sans" }, { L"Lucida Console", L"DejaVu Sans Mono" }, { L"MS Sans Serif", L"FreeSans" }, { L"MS Shell Dlg", L"FreeSans" }, { L"MS Shell Dlg 2", L"FreeSans" }, + { L"Palatino Linotype", L"FreeSans" }, + { L"System", L"FreeSans" }, { L"Tahoma", L"FreeSans" }, { L"Terminal", L"DejaVu Sans Mono" }, { L"Times", L"Liberation Serif" }, { L"Times New Roman", L"Liberation Serif" }, { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, - { L"System", L"FreeSans" }, - { L"Georgia", L"FreeSerif" }, - { L"Palatino Linotype", L"FreeSans" }, { NULL, NULL } };

1 0

[reactos] 01/01: [SETUP] Delete 'Comic Sans MS' font substitutes (#1769)
by Katayama Hirofumi MZ 30 Jul '19

30 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d31e814314763b789af41… commit d31e814314763b789af41f7a02544662c46ae23a Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 30 19:09:23 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 30 19:09:23 2019 +0900 [SETUP] Delete 'Comic Sans MS' font substitutes (#1769) Enable real 'Comic Sans MS' font by deleting the 'Comic Sans MS' font substitutes. CORE-16251 --- base/setup/lib/muifonts.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/base/setup/lib/muifonts.h b/base/setup/lib/muifonts.h index 72292afc466..1cdb78ecece 100644 --- a/base/setup/lib/muifonts.h +++ b/base/setup/lib/muifonts.h @@ -21,7 +21,6 @@ MUI_SUBFONT LatinFonts[] = { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } @@ -47,7 +46,6 @@ MUI_SUBFONT CyrillicFonts[] = { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } @@ -73,7 +71,6 @@ MUI_SUBFONT GreekFonts[] = { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } @@ -99,7 +96,6 @@ MUI_SUBFONT HebrewFonts[] = { L"Tms Rmn", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Tahoma" }, @@ -137,7 +133,6 @@ MUI_SUBFONT ChineseSimplifiedFonts[] = { L"SimHei", L"Droid Sans Fallback" }, { L"MS Song", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { L"Ubuntu", L"Droid Sans Fallback" }, @@ -180,7 +175,6 @@ MUI_SUBFONT ChineseTraditionalFonts[] = { L"DLCMingMedium", L"Droid Sans Fallback" }, { L"DLCMingBold", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, @@ -222,7 +216,6 @@ MUI_SUBFONT JapaneseFonts[] = { L"MS Gothic", L"Droid Sans Fallback" }, { L"MS PGothic", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, @@ -268,7 +261,6 @@ MUI_SUBFONT KoreanFonts[] = { L"Gulim", L"Droid Sans Fallback" }, { L"GulimChe", L"Droid Sans Fallback" }, { L"System", L"Droid Sans Fallback" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Franklin Gothic Medium", L"Droid Sans Fallback" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, @@ -303,7 +295,6 @@ MUI_SUBFONT UnicodeFonts[] = { L"Tms Rmn", L"DejaVu Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"DejaVu Serif" }, { NULL, NULL } @@ -330,7 +321,6 @@ MUI_SUBFONT HindiFonts[] = { L"Tms Rmn", L"Liberation Serif" }, { L"Trebuchet MS", L"Open Sans" }, { L"System", L"FreeSans" }, - { L"Comic Sans MS", L"Ubuntu" }, { L"Georgia", L"FreeSerif" }, { L"Palatino Linotype", L"FreeSans" }, { NULL, NULL }

1 0

[reactos] 01/01: [WIN32SS][NTGDI] Fix and improve font dumping (#1768)
by Katayama Hirofumi MZ 30 Jul '19

30 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7c9755b47dc8b193ea6d3… commit 7c9755b47dc8b193ea6d3dfc91a4767b4b559c4f Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Tue Jul 30 18:15:56 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Tue Jul 30 18:15:56 2019 +0900 [WIN32SS][NTGDI] Fix and improve font dumping (#1768) Fix and improve font dumping. CORE-16245 - FontGDI->FontObj is not a pointer. - "%s" does null check, so we remove redundant null checks. - Add FaceName and StyleName dumping. --- win32ss/gdi/ntgdi/freetype.c | 43 ++++++++++++++++++------------------------- 1 file changed, 18 insertions(+), 25 deletions(-) diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 3d94d788681..37ff3fbf5a7 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -382,11 +382,12 @@ static __inline FT_Fixed FT_FixedFromFIXED(FIXED f) #if DBG -VOID DumpFontGDI(PFONTGDI FontGDI) +VOID DumpFontEntry(PFONT_ENTRY FontEntry) { const char *family_name; const char *style_name; FT_Face Face; + PFONTGDI FontGDI = FontEntry->Font; if (!FontGDI) { @@ -398,12 +399,7 @@ VOID DumpFontGDI(PFONTGDI FontGDI) if (Face) { family_name = Face->family_name; - if (!family_name) - family_name = "<NULL>"; - style_name = Face->style_name; - if (!style_name) - style_name = "<NULL>"; } else { @@ -411,32 +407,32 @@ VOID DumpFontGDI(PFONTGDI FontGDI) style_name = "<invalid>"; } - DPRINT("family_name '%s', style_name '%s', FontGDI %p, FontObj %p, iUnique %lu, SharedFace %p, Face %p, CharSet %u, Filename '%S'\n", - family_name, - style_name, - FontGDI, - FontGDI->FontObj, - FontGDI->iUnique, - FontGDI->SharedFace, - Face, - FontGDI->CharSet, - FontGDI->Filename); + DPRINT("family_name '%s', style_name '%s', FaceName '%wZ', StyleName '%wZ', FontGDI %p, " + "FontObj %p, iUnique %lu, SharedFace %p, Face %p, CharSet %u, Filename '%S'\n", + family_name, + style_name, + &FontEntry->FaceName, + &FontEntry->StyleName, + FontGDI, + &FontGDI->FontObj, + FontGDI->iUnique, + FontGDI->SharedFace, + Face, + FontGDI->CharSet, + FontGDI->Filename); } VOID DumpFontList(PLIST_ENTRY Head) { PLIST_ENTRY Entry; PFONT_ENTRY CurrentEntry; - PFONTGDI FontGDI; DPRINT("## DumpFontList(%p)\n", Head); for (Entry = Head->Flink; Entry != Head; Entry = Entry->Flink) { CurrentEntry = CONTAINING_RECORD(Entry, FONT_ENTRY, ListEntry); - FontGDI = CurrentEntry->Font; - - DumpFontGDI(FontGDI); + DumpFontEntry(CurrentEntry); } } @@ -1365,11 +1361,8 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont) Entry->NotEnum = (Characteristics & FR_NOT_ENUM); InsertTailList(&LoadedFontList, &Entry->ListEntry); - DPRINT("Font loaded: %s (%s)\n", - Face->family_name ? Face->family_name : "<NULL>", - Face->style_name ? Face->style_name : "<NULL>"); - DPRINT("Num glyphs: %d\n", Face->num_glyphs); - DPRINT("CharSet: %d\n", FontGDI->CharSet); + DPRINT("Font loaded: %s (%s), CharSet %u, Num glyphs %d\n", + Face->family_name, Face->style_name, FontGDI->CharSet, Face->num_glyphs); } IntLockFreeType();

1 0

[reactos] 01/01: [FREELDR] Improve some *GetFileInformation() traces.
by Hermès Bélusca-Maïto 29 Jul '19

29 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b38214553992b85a6c802… commit b38214553992b85a6c8029b89cb8922759a88e28 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jul 30 00:57:22 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jul 30 00:57:22 2019 +0200 [FREELDR] Improve some *GetFileInformation() traces. --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 2 +- boot/freeldr/freeldr/disk/ramdisk.c | 2 +- boot/freeldr/freeldr/disk/scsiport.c | 2 +- boot/freeldr/freeldr/lib/fs/btrfs.c | 10 +++------- boot/freeldr/freeldr/lib/fs/ext2.c | 8 +++----- boot/freeldr/freeldr/lib/fs/fat.c | 8 +++----- boot/freeldr/freeldr/lib/fs/iso.c | 8 ++++---- boot/freeldr/freeldr/lib/fs/ntfs.c | 8 +++----- boot/freeldr/freeldr/lib/fs/pxe.c | 3 +++ 9 files changed, 22 insertions(+), 29 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index bae615b0a09..853d37f0981 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -64,7 +64,7 @@ DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); - RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + RtlZeroMemory(Information, sizeof(*Information)); Information->EndingAddress.QuadPart = Context->SectorCount * Context->SectorSize; Information->CurrentAddress.QuadPart = Context->SectorNumber * Context->SectorSize; diff --git a/boot/freeldr/freeldr/disk/ramdisk.c b/boot/freeldr/freeldr/disk/ramdisk.c index 4b2677a7951..b1a6f09dfd1 100644 --- a/boot/freeldr/freeldr/disk/ramdisk.c +++ b/boot/freeldr/freeldr/disk/ramdisk.c @@ -34,7 +34,7 @@ static ARC_STATUS RamDiskGetFileInformation(ULONG FileId, FILEINFORMATION* Infor // // Give current seek offset and ram disk size to caller // - RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + RtlZeroMemory(Information, sizeof(*Information)); Information->EndingAddress.LowPart = gRamDiskSize; Information->CurrentAddress.LowPart = gRamDiskOffset; diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 0c0a0fa66cc..8fc967d85ab 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -179,7 +179,7 @@ static ARC_STATUS DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Informat { DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); - RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + RtlZeroMemory(Information, sizeof(*Information)); Information->EndingAddress.QuadPart = Context->SectorCount * Context->SectorSize; Information->CurrentAddress.QuadPart = Context->SectorNumber * Context->SectorSize; diff --git a/boot/freeldr/freeldr/lib/fs/btrfs.c b/boot/freeldr/freeldr/lib/fs/btrfs.c index f3a8619262b..1258454db60 100644 --- a/boot/freeldr/freeldr/lib/fs/btrfs.c +++ b/boot/freeldr/freeldr/lib/fs/btrfs.c @@ -1123,16 +1123,12 @@ ARC_STATUS BtrFsGetFileInformation(ULONG FileId, FILEINFORMATION *Information) { pbtrfs_file_info phandle = FsGetDeviceSpecific(FileId); - TRACE("BtrFsGetFileInformation %lu\n", FileId); - - RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + RtlZeroMemory(Information, sizeof(*Information)); Information->EndingAddress.QuadPart = phandle->inode.size; Information->CurrentAddress.QuadPart = phandle->position; - TRACE("BtrFsGetFileInformation() FileSize = %llu\n", - Information->EndingAddress.QuadPart); - TRACE("BtrFsGetFileInformation() FilePointer = %llu\n", - Information->CurrentAddress.QuadPart); + TRACE("BtrFsGetFileInformation(%lu) -> FileSize = %llu, FilePointer = 0x%llx\n", + FileId, Information->EndingAddress.QuadPart, Information->CurrentAddress.QuadPart); return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/ext2.c b/boot/freeldr/freeldr/lib/fs/ext2.c index 3428bd42d97..30ec019508e 100644 --- a/boot/freeldr/freeldr/lib/fs/ext2.c +++ b/boot/freeldr/freeldr/lib/fs/ext2.c @@ -1207,14 +1207,12 @@ ARC_STATUS Ext2GetFileInformation(ULONG FileId, FILEINFORMATION* Information) { PEXT2_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); - RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + RtlZeroMemory(Information, sizeof(*Information)); Information->EndingAddress.QuadPart = FileHandle->FileSize; Information->CurrentAddress.QuadPart = FileHandle->FilePointer; - TRACE("Ext2GetFileInformation() FileSize = %d\n", - Information->EndingAddress.LowPart); - TRACE("Ext2GetFileInformation() FilePointer = %d\n", - Information->CurrentAddress.LowPart); + TRACE("Ext2GetFileInformation(%lu) -> FileSize = %llu, FilePointer = 0x%llx\n", + FileId, Information->EndingAddress.QuadPart, Information->CurrentAddress.QuadPart); return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index 6daa1a0b4fa..17f341c87ec 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -1411,14 +1411,12 @@ ARC_STATUS FatGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { PFAT_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); - RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + RtlZeroMemory(Information, sizeof(*Information)); Information->EndingAddress.LowPart = FileHandle->FileSize; Information->CurrentAddress.LowPart = FileHandle->FilePointer; - TRACE("FatGetFileInformation() FileSize = %d\n", - Information->EndingAddress.LowPart); - TRACE("FatGetFileInformation() FilePointer = %d\n", - Information->CurrentAddress.LowPart); + TRACE("FatGetFileInformation(%lu) -> FileSize = %lu, FilePointer = 0x%lx\n", + FileId, Information->EndingAddress.LowPart, Information->CurrentAddress.LowPart); return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/iso.c b/boot/freeldr/freeldr/lib/fs/iso.c index cc5a980e009..cdf0281a563 100644 --- a/boot/freeldr/freeldr/lib/fs/iso.c +++ b/boot/freeldr/freeldr/lib/fs/iso.c @@ -253,13 +253,13 @@ ARC_STATUS IsoGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { PISO_FILE_INFO FileHandle = FsGetDeviceSpecific(FileId); - TRACE("IsoGetFileInformation() FileSize = %d\n", FileHandle->FileSize); - TRACE("IsoGetFileInformation() FilePointer = %d\n", FileHandle->FilePointer); - - RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + RtlZeroMemory(Information, sizeof(*Information)); Information->EndingAddress.LowPart = FileHandle->FileSize; Information->CurrentAddress.LowPart = FileHandle->FilePointer; + TRACE("IsoGetFileInformation(%lu) -> FileSize = %lu, FilePointer = 0x%lx\n", + FileId, Information->EndingAddress.LowPart, Information->CurrentAddress.LowPart); + return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/ntfs.c b/boot/freeldr/freeldr/lib/fs/ntfs.c index 5b0b510ac64..359bebc2ea4 100644 --- a/boot/freeldr/freeldr/lib/fs/ntfs.c +++ b/boot/freeldr/freeldr/lib/fs/ntfs.c @@ -766,14 +766,12 @@ ARC_STATUS NtfsGetFileInformation(ULONG FileId, FILEINFORMATION* Information) { PNTFS_FILE_HANDLE FileHandle = FsGetDeviceSpecific(FileId); - RtlZeroMemory(Information, sizeof(FILEINFORMATION)); + RtlZeroMemory(Information, sizeof(*Information)); Information->EndingAddress.QuadPart = NtfsGetAttributeSize(&FileHandle->DataContext->Record); Information->CurrentAddress.QuadPart = FileHandle->Offset; - TRACE("NtfsGetFileInformation() FileSize = %d\n", - Information->EndingAddress.LowPart); - TRACE("NtfsGetFileInformation() FilePointer = %d\n", - Information->CurrentAddress.LowPart); + TRACE("NtfsGetFileInformation(%lu) -> FileSize = %llu, FilePointer = 0x%llx\n", + FileId, Information->EndingAddress.QuadPart, Information->CurrentAddress.QuadPart); return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/pxe.c b/boot/freeldr/freeldr/lib/fs/pxe.c index 4b5aac91520..dedc3157faa 100644 --- a/boot/freeldr/freeldr/lib/fs/pxe.c +++ b/boot/freeldr/freeldr/lib/fs/pxe.c @@ -145,6 +145,9 @@ static ARC_STATUS PxeGetFileInformation(ULONG FileId, FILEINFORMATION* Informati Information->EndingAddress.LowPart = _FileSize; Information->CurrentAddress.LowPart = _FilePosition; + TRACE("PxeGetFileInformation(%lu) -> FileSize = %lu, FilePointer = 0x%lx\n", + FileId, Information->EndingAddress.LowPart, Information->CurrentAddress.LowPart); + return ESUCCESS; }

1 0

[reactos] 01/01: [FREELDR] Fix remaining hwdisk and FATX bugs (#1766)
by Stanislav Motylkov 29 Jul '19

29 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ef76709b3d2d376ed4747… commit ef76709b3d2d376ed4747f337759383bc40a433c Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Tue Jul 30 01:27:36 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Tue Jul 30 00:27:36 2019 +0200 [FREELDR] Fix remaining hwdisk and FATX bugs (#1766) - DiskGetFileInformation() should return relative addresses -- relative to the beginning of the "device" (partition, or disk) in question. - FatXSearchDirectoryBufferForFile() should assign file attributes. - Minor code style improvements in FatOpenVolume(). CORE-16216 CORE-16248 Co-authored-by: Victor Perevertkin <victor(a)perevertkin.ru> --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 4 ++-- boot/freeldr/freeldr/lib/fs/fat.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index 50bb00e8406..bae615b0a09 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -65,8 +65,8 @@ DiskGetFileInformation(ULONG FileId, FILEINFORMATION* Information) DISKCONTEXT* Context = FsGetDeviceSpecific(FileId); RtlZeroMemory(Information, sizeof(FILEINFORMATION)); - Information->EndingAddress.QuadPart = (Context->SectorOffset + Context->SectorCount) * Context->SectorSize; - Information->CurrentAddress.QuadPart = (Context->SectorOffset + Context->SectorNumber) * Context->SectorSize; + Information->EndingAddress.QuadPart = Context->SectorCount * Context->SectorSize; + Information->CurrentAddress.QuadPart = Context->SectorNumber * Context->SectorSize; return ESUCCESS; } diff --git a/boot/freeldr/freeldr/lib/fs/fat.c b/boot/freeldr/freeldr/lib/fs/fat.c index 6af232b3acf..6daa1a0b4fa 100644 --- a/boot/freeldr/freeldr/lib/fs/fat.c +++ b/boot/freeldr/freeldr/lib/fs/fat.c @@ -266,12 +266,12 @@ BOOLEAN FatOpenVolume(PFAT_VOLUME_INFO Volume, PFAT_BOOTSECTOR BootSector, ULONG { Volume->BytesPerSector = 512; Volume->SectorsPerCluster = SWAPD(FatXVolumeBootSector->SectorsPerCluster); - Volume->FatSectorStart = (4096 / Volume->BytesPerSector); + Volume->FatSectorStart = (0x1000 / Volume->BytesPerSector); Volume->ActiveFatSectorStart = Volume->FatSectorStart; Volume->NumberOfFats = 1; FatSize = (ULONG)(PartitionSectorCount / Volume->SectorsPerCluster * (Volume->FatType == FATX16 ? 2 : 4)); - Volume->SectorsPerFat = (((FatSize + 4095) / 4096) * 4096) / Volume->BytesPerSector; + Volume->SectorsPerFat = ROUND_UP(FatSize, 0x1000) / Volume->BytesPerSector; Volume->RootDirSectorStart = Volume->FatSectorStart + Volume->NumberOfFats * Volume->SectorsPerFat; Volume->RootDirSectors = FatXVolumeBootSector->SectorsPerCluster; @@ -720,6 +720,7 @@ static BOOLEAN FatXSearchDirectoryBufferForFile(PFAT_VOLUME_INFO Volume, PVOID D /* * We found the entry, now fill in the FAT_FILE_INFO struct */ + FatFileInfoPointer->Attributes = DirEntry->Attr; FatFileInfoPointer->FileSize = DirEntry->Size; FatFileInfoPointer->FilePointer = 0;

1 0

[reactos] 01/01: [KBDHU] Fix Hungarian keyboard layout. (#1765)
by Tibor Lajos Füzi 29 Jul '19

29 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=48200015f7223e8cc98c8… commit 48200015f7223e8cc98c8a6e03cbce9db23aa57c Author: Tibor Lajos Füzi <47159668+blueghost-tbs(a)users.noreply.github.com> AuthorDate: Mon Jul 29 21:55:24 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jul 29 21:55:24 2019 +0200 [KBDHU] Fix Hungarian keyboard layout. (#1765) CORE-15567 --- dll/keyboard/kbdhu/kbdhu.c | 122 ++++++++++++++++++++++++--------------------- 1 file changed, 64 insertions(+), 58 deletions(-) diff --git a/dll/keyboard/kbdhu/kbdhu.c b/dll/keyboard/kbdhu/kbdhu.c index 209797dacb9..e300fbd2f6f 100644 --- a/dll/keyboard/kbdhu/kbdhu.c +++ b/dll/keyboard/kbdhu/kbdhu.c @@ -1,7 +1,8 @@ /* * ReactOS Hungarian keyboard layout - * Copyright (C) 2003 ReactOS + * Copyright (C) 2003 - 2019 ReactOS * License: LGPL, see: LGPL.txt + * Author: Tibor Lajos Füzi * * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php * and http://win.tue.nl/~aeb/linux/kbd/scancodes-1.html @@ -35,12 +36,12 @@ ROSDATA USHORT scancode_to_vk[] = { /* 1 ... 2 ... 3 ... 4 ... */ VK_EMPTY, VK_ESCAPE, '1', '2', '3', '4', '5', '6', - '7', '8', '9', '0', - VK_OEM_MINUS, VK_OEM_PLUS, VK_BACK, + '7', '8', '9', VK_OEM_3, + VK_OEM_2, VK_OEM_PLUS, VK_BACK, /* - 0f - */ /* First Letters Row */ VK_TAB, 'Q', 'W', 'E', - 'R', 'T', 'Y', 'U', + 'R', 'T', 'Z', 'U', 'I', 'O', 'P', VK_OEM_4, VK_OEM_6, VK_RETURN, /* - 1d - */ @@ -48,13 +49,13 @@ ROSDATA USHORT scancode_to_vk[] = { VK_LCONTROL, 'A', 'S', 'D', 'F', 'G', 'H', 'J', 'K', - 'L', VK_OEM_1, VK_OEM_7, VK_OEM_3, + 'L', VK_OEM_1, VK_OEM_7, '0', VK_LSHIFT, VK_OEM_5, /* - 2c - */ /* Third letters row */ - 'Z', 'X', 'C', 'V', + 'Y', 'X', 'C', 'V', 'B', 'N', 'M', VK_OEM_COMMA, - VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT, + VK_OEM_PERIOD,VK_OEM_MINUS, VK_RSHIFT, /* - 37 - */ /* Bottom Row */ VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, @@ -78,7 +79,7 @@ ROSDATA USHORT scancode_to_vk[] = { VK_SNAPSHOT, /* - 55 - */ /* Oddities, and the remaining standard F-Keys */ - VK_EMPTY, VK_EMPTY, VK_F11, VK_F12, + VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, /* - 59 - */ VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */ @@ -159,63 +160,23 @@ ROSDATA VK_TO_BIT modifier_keys[] = { ROSDATA MODIFIERS modifier_bits = { modifier_keys, - 3, - { 0, 1, 2, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT */ + 6, + { 0, 1, 3, 4, SHFT_INVALID, SHFT_INVALID, 2 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT, MENU, SHIFT + MENU, CTRL + MENU */ }; ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { /* Normal vs Shifted */ /* The numbers */ - { '1', 0, {'1', '\''} }, - /* Ctrl-2 generates NUL */ - { '3', 0, {'3', '+'} }, - { '4', 0, {'4', '!'} }, - { '5', 0, {'5', '%'} }, - /* Ctrl-6 generates RS */ - { '7', 0, {'7', '='} }, - { '8', 0, {'8', '('} }, - { '9', 0, {'9', ')'} }, - { '0', 0, {0xf6, 0xd6} }, + { '0', 0, {'0', 0xa7} }, /* First letter row */ - { 'Q', CAPLOK, {'q', 'Q'} }, - { 'W', CAPLOK, {'w', 'W'} }, - { 'E', CAPLOK, {'e', 'E'} }, { 'R', CAPLOK, {'r', 'R'} }, { 'T', CAPLOK, {'t', 'T'} }, - { 'Y', CAPLOK, {'y', 'Y'} }, - { 'U', CAPLOK, {'u', 'U'} }, - { 'I', CAPLOK, {'i', 'I'} }, + { 'Z', CAPLOK, {'z', 'Z'} }, { 'O', CAPLOK, {'o', 'O'} }, { 'P', CAPLOK, {'p', 'P'} }, /* Second letter row */ - { 'A', CAPLOK, {'a', 'A'} }, - { 'S', CAPLOK, {'s', 'S'} }, - { 'D', CAPLOK, {'d', 'D'} }, - { 'F', CAPLOK, {'f', 'F'} }, - { 'G', CAPLOK, {'g', 'G'} }, { 'H', CAPLOK, {'h', 'H'} }, - { 'J', CAPLOK, {'j', 'J'} }, - { 'K', CAPLOK, {'k', 'K'} }, - { 'L', CAPLOK, {'l', 'L'} }, - /* Third letter row */ - { 'Z', CAPLOK, {'z', 'Z'} }, - { 'X', CAPLOK, {'x', 'X'} }, - { 'C', CAPLOK, {'c', 'C'} }, - { 'V', CAPLOK, {'v', 'V'} }, - { 'B', CAPLOK, {'b', 'B'} }, - { 'N', CAPLOK, {'n', 'N'} }, - { 'M', CAPLOK, {'m', 'M'} }, - /* Specials */ - /* Ctrl-_ generates US */ - { VK_OEM_PLUS ,0, {0xf3, 0xd3} }, - { VK_OEM_1 ,0, {0xe9, 0xc9} }, - { VK_OEM_7 ,0, {0xfb, 0xdb} }, - { VK_OEM_3 ,0, {'0', 0xa7} }, - { VK_OEM_COMMA ,0, {',', '?'} }, - { VK_OEM_PERIOD ,0, {'.', ':'} }, - { VK_OEM_2 ,0, {'-', '_'} }, - /* Keys that do not have shift states */ { VK_TAB ,0, {'\t','\t'} }, { VK_ADD ,0, {'+', '+'} }, { VK_SUBTRACT,0, {'-', '-'} }, @@ -227,12 +188,57 @@ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { }; ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { - /* Normal, Shifted, Ctrl */ + /* Normal, Shifted, AltGr */ /* Legacy (telnet-style) ascii escapes */ - { VK_OEM_4, 0, {0xf5, 0xd5, 0x1b /* ESC */} }, - { VK_OEM_6, 0, {0xfa, 0xda, 0x1d /* GS */} }, - { VK_OEM_5, 0, {0xfb, 0xdb, 0x1c /* FS */} }, - { VK_RETURN,0, {'\r', '\r', '\n'} }, + /* The numbers */ + { '1', 0, {'1', '\'', '~'} }, + { '2', 0, {'2', '\"', 0x2c7} }, + { '3', 0, {'3', '+', '^'} }, + { '4', 0, {'4', '!', 0x2d8} }, + { '5', 0, {'5', '%', 0xb0} }, + { '6', 0, {'6', '/', 0x2db} }, + { '7', 0, {'7', '=', '`'} }, + { '8', 0, {'8', '(', 0x2d9} }, + { '9', 0, {'9', ')', 0xb4} }, + + { VK_OEM_3, CAPLOK, {0xf6, 0xd6, 0X2DD} }, + { VK_OEM_2, CAPLOK, {0xfc, 0xdc, 0xa8} }, + { VK_OEM_PLUS, CAPLOK, {0xf3, 0xd3, 0xb8} }, + + /* First letter row */ + { 'Q', CAPLOK, {'q', 'Q', '\\'} }, + { 'W', CAPLOK, {'w', 'W', '|'} }, + { 'E', CAPLOK, {'e', 'E', 0xc4} }, + { 'U', CAPLOK, {'u', 'U', 0x20ac} }, + { 'I', CAPLOK, {'i', 'I', 0xcd} }, + { VK_OEM_4, CAPLOK, {0x151, 0x150, 0xf7} }, + { VK_OEM_6, CAPLOK, {0xfa, 0xda, 0xd7} }, + /* Second letter row */ + { 'A', CAPLOK, {'a', 'A', 0xe4} }, + { 'S', CAPLOK, {'s', 'S', 0x111} }, + { 'D', CAPLOK, {'d', 'D', 0x110} }, + { 'F', CAPLOK, {'f', 'F', '['} }, + { 'G', CAPLOK, {'g', 'G', ']'} }, + { 'J', CAPLOK, {'j', 'J', 0xed} }, + { 'K', CAPLOK, {'k', 'K', 0x142} }, + { 'L', CAPLOK, {'l', 'L', 0x141} }, + { VK_OEM_1, CAPLOK, {0xe9, 0xc9, '$'} }, + { VK_OEM_7, CAPLOK, {0xe1, 0xc1, 0xdf} }, + { VK_OEM_5, CAPLOK, {0x171, 0x170, 0xa4} }, + /* Third letter row */ + { VK_OEM_102, CAPLOK, {0xed, 0xcd, '<'} }, + { 'Y', CAPLOK, {'y', 'Y', '>'} }, + { 'X', CAPLOK, {'x', 'X', '#'} }, + { 'C', CAPLOK, {'c', 'C', '&'} }, + { 'V', CAPLOK, {'v', 'V', '@'} }, + { 'B', CAPLOK, {'b', 'B', '{'} }, + { 'N', CAPLOK, {'n', 'N', '}'} }, + { 'M', CAPLOK, {'m', 'M', '<'} }, + { VK_OEM_COMMA, 0, {',', '?', ';'} }, + { VK_OEM_PERIOD, 0, {'.', ':', '>'} }, + { VK_OEM_MINUS, 0, {'-', '_', '*'} }, + /* Special */ + { VK_RETURN, 0, {'\r', '\r', '\n'} }, { 0,0 } }; @@ -375,7 +381,7 @@ ROSDATA KBDTABLES keyboard_layout_table = { extcode0_to_vk, extcode1_to_vk, - MAKELONG(0, 1), /* Version 1.0 */ + MAKELONG(KLLF_ALTGR, 1), /* Version 1.0 */ /* Ligatures -- Hungarian doesn't have any */ 0,

1 0

[reactos] 01/01: [NtGDI] Fix one size region test.
by jimtabor 29 Jul '19

29 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=02db01f3a6ec05069f784… commit 02db01f3a6ec05069f78437b0c2d8d6c57763be8 Author: jimtabor <james.tabor(a)reactos.org> AuthorDate: Mon Jul 29 13:02:07 2019 -0500 Commit: jimtabor <james.tabor(a)reactos.org> CommitDate: Mon Jul 29 13:02:07 2019 -0500 [NtGDI] Fix one size region test. See CORE-16246, the clip region may be the same size but more complex than the callers simple region. --- win32ss/gdi/ntgdi/cliprgn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/win32ss/gdi/ntgdi/cliprgn.c b/win32ss/gdi/ntgdi/cliprgn.c index 566ce3fa4be..23f32426fe5 100644 --- a/win32ss/gdi/ntgdi/cliprgn.c +++ b/win32ss/gdi/ntgdi/cliprgn.c @@ -31,7 +31,7 @@ IntGdiReleaseVisRgn(PDC pDC) } // -// Updating Vis Region Attribute the for DC Attributes. +// Updating Vis Region Attribute for DC Attributes. // BTW: This system region has an user attribute for it. // VOID @@ -239,8 +239,8 @@ IntGdiExtSelectClipRect( } } else // Have a box to build a region with. - { - if (dc->dclevel.prgnClip) + { // See CORE-16246 : Needs to be a one box Clip Region. + if ( dc->dclevel.prgnClip && (REGION_Complexity(dc->dclevel.prgnClip) == SIMPLEREGION) ) { REGION_GetRgnBox(dc->dclevel.prgnClip, &rect);

1 0

[reactos] 01/01: [FREELDR] Implement proper partition type detection and handling (#1762)
by Stanislav Motylkov 29 Jul '19

29 Jul '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06b77b857250ee22e8ec5… commit 06b77b857250ee22e8ec5250d5ffdc3d486726a6 Author: Stanislav Motylkov <x86corez(a)gmail.com> AuthorDate: Mon Jul 29 15:25:54 2019 +0300 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Jul 29 14:25:54 2019 +0200 [FREELDR] Implement proper partition type detection and handling (#1762) - This allows to detect and dynamically handle different partitioning schemes. - Implemented detection of MBR, GPT, Xbox-BRFR, and partitionless disks. - Currently only MBR and Xbox-BRFR partitions are handled and tested. CORE-9841 CORE-15768 CORE-16216 CORE-16248 --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 3 + boot/freeldr/freeldr/arch/i386/machpc.c | 2 - boot/freeldr/freeldr/arch/i386/machxbox.c | 2 - boot/freeldr/freeldr/arch/i386/xboxdisk.c | 45 ------ boot/freeldr/freeldr/disk/disk.c | 4 +- boot/freeldr/freeldr/disk/partition.c | 177 +++++++++++++++++++++- boot/freeldr/freeldr/include/arch/i386/machxbox.h | 1 - boot/freeldr/freeldr/include/disk.h | 16 +- sdk/include/psdk/ntdddisk.h | 6 +- 9 files changed, 184 insertions(+), 72 deletions(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index 826780a07fb..50bb00e8406 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -231,6 +231,9 @@ GetHarddiskInformation(UCHAR DriveNumber) PARTITION_TABLE_ENTRY PartitionTableEntry; PCHAR Identifier = PcDiskIdentifier[DriveNumber - 0x80]; + /* Detect disk partition type */ + DiskDetectPartitionType(DriveNumber); + /* Read the MBR */ if (!MachDiskReadLogicalSectors(DriveNumber, 0ULL, 1, DiskReadBuffer)) { diff --git a/boot/freeldr/freeldr/arch/i386/machpc.c b/boot/freeldr/freeldr/arch/i386/machpc.c index 497f89b5483..5ec2195638a 100644 --- a/boot/freeldr/freeldr/arch/i386/machpc.c +++ b/boot/freeldr/freeldr/arch/i386/machpc.c @@ -1422,8 +1422,6 @@ PcMachInit(const char *CmdLine) MachVtbl.InitializeBootDevices = PcInitializeBootDevices; MachVtbl.HwDetect = PcHwDetect; MachVtbl.HwIdle = PcHwIdle; - - // DiskGetPartitionEntry = DiskGetMbrPartitionEntry; // Default } VOID diff --git a/boot/freeldr/freeldr/arch/i386/machxbox.c b/boot/freeldr/freeldr/arch/i386/machxbox.c index 350a0c3e1e7..139f5719251 100644 --- a/boot/freeldr/freeldr/arch/i386/machxbox.c +++ b/boot/freeldr/freeldr/arch/i386/machxbox.c @@ -231,8 +231,6 @@ XboxMachInit(const char *CmdLine) MachVtbl.HwDetect = XboxHwDetect; MachVtbl.HwIdle = XboxHwIdle; - DiskGetPartitionEntry = XboxDiskGetPartitionEntry; - /* Set LEDs to orange after init */ XboxSetLED("oooo"); } diff --git a/boot/freeldr/freeldr/arch/i386/xboxdisk.c b/boot/freeldr/freeldr/arch/i386/xboxdisk.c index 9e31ce9937d..e1e4d3559e7 100644 --- a/boot/freeldr/freeldr/arch/i386/xboxdisk.c +++ b/boot/freeldr/freeldr/arch/i386/xboxdisk.c @@ -30,25 +30,6 @@ DBG_DEFAULT_CHANNEL(DISK); #define XBOX_IDE_COMMAND_PORT 0x1f0 #define XBOX_IDE_CONTROL_PORT 0x170 -/* BRFR signature at disk offset 0x600 */ -#define XBOX_SIGNATURE_SECTOR 3 -#define XBOX_SIGNATURE ('B' | ('R' << 8) | ('F' << 16) | ('R' << 24)) - -static struct -{ - ULONG SectorCountBeforePartition; - ULONG PartitionSectorCount; - UCHAR SystemIndicator; -} XboxPartitions[] = -{ - /* This is in the \Device\Harddisk0\Partition.. order used by the Xbox kernel */ - { 0x0055F400, 0x0098f800, PARTITION_FAT32 }, /* Store , E: */ - { 0x00465400, 0x000FA000, PARTITION_FAT_16 }, /* System, C: */ - { 0x00000400, 0x00177000, PARTITION_FAT_16 }, /* Cache1, X: */ - { 0x00177400, 0x00177000, PARTITION_FAT_16 }, /* Cache2, Y: */ - { 0x002EE400, 0x00177000, PARTITION_FAT_16 } /* Cache3, Z: */ -}; - #define IDE_SECTOR_BUF_SZ 512 #define IDE_MAX_POLL_RETRIES 100000 #define IDE_MAX_BUSY_RETRIES 50000 @@ -471,32 +452,6 @@ XboxDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG Sect return TRUE; } -BOOLEAN -XboxDiskGetPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry) -{ - UCHAR SectorData[IDE_SECTOR_BUF_SZ]; - - /* - * This is the Xbox, chances are that there is a Xbox-standard - * partitionless disk in it so let's check that first. - */ - if (PartitionNumber >= 1 && PartitionNumber <= sizeof(XboxPartitions) / sizeof(XboxPartitions[0]) && - MachDiskReadLogicalSectors(DriveNumber, XBOX_SIGNATURE_SECTOR, 1, SectorData)) - { - if (*((PULONG) SectorData) == XBOX_SIGNATURE) - { - memset(PartitionTableEntry, 0, sizeof(PARTITION_TABLE_ENTRY)); - PartitionTableEntry->SystemIndicator = XboxPartitions[PartitionNumber - 1].SystemIndicator; - PartitionTableEntry->SectorCountBeforePartition = XboxPartitions[PartitionNumber - 1].SectorCountBeforePartition; - PartitionTableEntry->PartitionSectorCount = XboxPartitions[PartitionNumber - 1].PartitionSectorCount; - return TRUE; - } - } - - /* No magic Xbox partitions, maybe there's a MBR */ - return DiskGetMbrPartitionEntry(DriveNumber, PartitionNumber, PartitionTableEntry); -} - BOOLEAN XboxDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY Geometry) { diff --git a/boot/freeldr/freeldr/disk/disk.c b/boot/freeldr/freeldr/disk/disk.c index 55701205248..11cc0a7a63d 100644 --- a/boot/freeldr/freeldr/disk/disk.c +++ b/boot/freeldr/freeldr/disk/disk.c @@ -130,9 +130,9 @@ BOOLEAN DiskGetBootPath(OUT PCHAR BootPath, IN ULONG Size) PARTITION_TABLE_ENTRY PartitionEntry; /* This is a hard disk */ - if (!DiskGetActivePartitionEntry(FrldrBootDrive, &PartitionEntry, &BootPartition)) + if (!DiskGetBootPartitionEntry(FrldrBootDrive, &PartitionEntry, &BootPartition)) { - ERR("Invalid active partition information\n"); + ERR("Failed to get boot partition entry\n"); return FALSE; } diff --git a/boot/freeldr/freeldr/disk/partition.c b/boot/freeldr/freeldr/disk/partition.c index 1feaf5105c7..3aa69d9b589 100644 --- a/boot/freeldr/freeldr/disk/partition.c +++ b/boot/freeldr/freeldr/disk/partition.c @@ -17,11 +17,6 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* - * TODO: This is here where we should add support for GPT partitions - * as well as partitionless disks! - */ - #ifndef _M_ARM #include <freeldr.h> @@ -29,8 +24,30 @@ DBG_DEFAULT_CHANNEL(DISK); -/* This function serves to retrieve a partition entry for devices that handle partitions differently */ -DISK_GET_PARTITION_ENTRY DiskGetPartitionEntry = DiskGetMbrPartitionEntry; +#define MaxDriveNumber 0xFF +PARTITION_STYLE DiskPartitionType[MaxDriveNumber + 1]; + +/* BRFR signature at disk offset 0x600 */ +#define XBOX_SIGNATURE_SECTOR 3 +#define XBOX_SIGNATURE ('B' | ('R' << 8) | ('F' << 16) | ('R' << 24)) + +/* Default hardcoded partition number to boot from Xbox disk */ +#define FATX_DATA_PARTITION 1 + +static struct +{ + ULONG SectorCountBeforePartition; + ULONG PartitionSectorCount; + UCHAR SystemIndicator; +} XboxPartitions[] = +{ + /* This is in the \Device\Harddisk0\Partition.. order used by the Xbox kernel */ + { 0x0055F400, 0x0098F800, PARTITION_FAT32 }, /* Store , E: */ + { 0x00465400, 0x000FA000, PARTITION_FAT_16 }, /* System, C: */ + { 0x00000400, 0x00177000, PARTITION_FAT_16 }, /* Cache1, X: */ + { 0x00177400, 0x00177000, PARTITION_FAT_16 }, /* Cache2, Y: */ + { 0x002EE400, 0x00177000, PARTITION_FAT_16 } /* Cache3, Z: */ +}; BOOLEAN DiskGetActivePartitionEntry(UCHAR DriveNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry, @@ -253,6 +270,152 @@ BOOLEAN DiskReadBootRecord(UCHAR DriveNumber, ULONGLONG LogicalSectorNumber, PMA return TRUE; } +BOOLEAN +DiskGetBrfrPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry) +{ + /* + * Get partition entry of an Xbox-standard BRFR partitioned disk. + */ + if (PartitionNumber >= 1 && PartitionNumber <= sizeof(XboxPartitions) / sizeof(XboxPartitions[0]) && + MachDiskReadLogicalSectors(DriveNumber, XBOX_SIGNATURE_SECTOR, 1, DiskReadBuffer)) + { + if (*((PULONG)DiskReadBuffer) != XBOX_SIGNATURE) + { + /* No magic Xbox partitions */ + return FALSE; + } + + memset(PartitionTableEntry, 0, sizeof(PARTITION_TABLE_ENTRY)); + PartitionTableEntry->SystemIndicator = XboxPartitions[PartitionNumber - 1].SystemIndicator; + PartitionTableEntry->SectorCountBeforePartition = XboxPartitions[PartitionNumber - 1].SectorCountBeforePartition; + PartitionTableEntry->PartitionSectorCount = XboxPartitions[PartitionNumber - 1].PartitionSectorCount; + return TRUE; + } + + /* Partition does not exist */ + return FALSE; +} + +VOID DiskDetectPartitionType(UCHAR DriveNumber) +{ + MASTER_BOOT_RECORD MasterBootRecord; + ULONG Index; + ULONG PartitionCount = 0; + PPARTITION_TABLE_ENTRY ThisPartitionTableEntry; + BOOLEAN GPTProtect = FALSE; + PARTITION_TABLE_ENTRY PartitionTableEntry; + + /* Probe for Master Boot Record */ + if (DiskReadBootRecord(DriveNumber, 0, &MasterBootRecord)) + { + DiskPartitionType[DriveNumber] = PARTITION_STYLE_MBR; + + /* Check for GUID Partition Table */ + for (Index = 0; Index < 4; Index++) + { + ThisPartitionTableEntry = &MasterBootRecord.PartitionTable[Index]; + + if (ThisPartitionTableEntry->SystemIndicator != PARTITION_ENTRY_UNUSED) + { + PartitionCount++; + + if (Index == 0 && ThisPartitionTableEntry->SystemIndicator == PARTITION_GPT) + { + GPTProtect = TRUE; + } + } + } + + if (PartitionCount == 1 && GPTProtect) + { + DiskPartitionType[DriveNumber] = PARTITION_STYLE_GPT; + } + TRACE("Drive 0x%X partition type %s\n", DriveNumber, DiskPartitionType[DriveNumber] == PARTITION_STYLE_MBR ? "MBR" : "GPT"); + return; + } + + /* Probe for Xbox-BRFR partitioning */ + if (DiskGetBrfrPartitionEntry(DriveNumber, FATX_DATA_PARTITION, &PartitionTableEntry)) + { + DiskPartitionType[DriveNumber] = PARTITION_STYLE_BRFR; + TRACE("Drive 0x%X partition type Xbox-BRFR\n", DriveNumber); + return; + } + + /* Failed to detect partitions, assume partitionless disk */ + DiskPartitionType[DriveNumber] = PARTITION_STYLE_RAW; + TRACE("Drive 0x%X partition type unknown\n", DriveNumber); +} + +BOOLEAN DiskGetBootPartitionEntry(UCHAR DriveNumber, + PPARTITION_TABLE_ENTRY PartitionTableEntry, + ULONG *BootPartition) +{ + switch (DiskPartitionType[DriveNumber]) + { + case PARTITION_STYLE_MBR: + { + return DiskGetActivePartitionEntry(DriveNumber, PartitionTableEntry, BootPartition); + } + case PARTITION_STYLE_GPT: + { + FIXME("DiskGetBootPartitionEntry() unimplemented for GPT\n"); + return FALSE; + } + case PARTITION_STYLE_RAW: + { + FIXME("DiskGetBootPartitionEntry() unimplemented for RAW\n"); + return FALSE; + } + case PARTITION_STYLE_BRFR: + { + if (DiskGetBrfrPartitionEntry(DriveNumber, FATX_DATA_PARTITION, PartitionTableEntry)) + { + *BootPartition = FATX_DATA_PARTITION; + return TRUE; + } + return FALSE; + } + default: + { + ERR("Drive 0x%X partition type = %d, should not happen!\n", DriveNumber, DiskPartitionType[DriveNumber]); + ASSERT(FALSE); + } + } + return FALSE; +} + +BOOLEAN DiskGetPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry) +{ + switch (DiskPartitionType[DriveNumber]) + { + case PARTITION_STYLE_MBR: + { + return DiskGetMbrPartitionEntry(DriveNumber, PartitionNumber, PartitionTableEntry); + } + case PARTITION_STYLE_GPT: + { + FIXME("DiskGetPartitionEntry() unimplemented for GPT\n"); + return FALSE; + } + case PARTITION_STYLE_RAW: + { + FIXME("DiskGetPartitionEntry() unimplemented for RAW\n"); + return FALSE; + } + case PARTITION_STYLE_BRFR: + { + return DiskGetBrfrPartitionEntry(DriveNumber, PartitionNumber, PartitionTableEntry); + } + default: + { + ERR("Drive 0x%X partition type = %d, should not happen!\n", DriveNumber, DiskPartitionType[DriveNumber]); + ASSERT(FALSE); + } + } + return FALSE; +} + #ifndef _M_AMD64 NTSTATUS NTAPI diff --git a/boot/freeldr/freeldr/include/arch/i386/machxbox.h b/boot/freeldr/freeldr/include/arch/i386/machxbox.h index 3a394c35703..d1c42a40bae 100644 --- a/boot/freeldr/freeldr/include/arch/i386/machxbox.h +++ b/boot/freeldr/freeldr/include/arch/i386/machxbox.h @@ -52,7 +52,6 @@ PVOID XboxMemReserveMemory(ULONG MbToReserve); PFREELDR_MEMORY_DESCRIPTOR XboxMemGetMemoryMap(ULONG *MemoryMapSize); BOOLEAN XboxDiskReadLogicalSectors(UCHAR DriveNumber, ULONGLONG SectorNumber, ULONG SectorCount, PVOID Buffer); -BOOLEAN XboxDiskGetPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN XboxDiskGetDriveGeometry(UCHAR DriveNumber, PGEOMETRY DriveGeometry); ULONG XboxDiskGetCacheableBlockCount(UCHAR DriveNumber); diff --git a/boot/freeldr/freeldr/include/disk.h b/boot/freeldr/freeldr/include/disk.h index a701ad26c15..6629c768dcf 100644 --- a/boot/freeldr/freeldr/include/disk.h +++ b/boot/freeldr/freeldr/include/disk.h @@ -102,6 +102,7 @@ typedef struct _MASTER_BOOT_RECORD #define PARTITION_UNIX 0x63 // Unix #define VALID_NTFT 0xC0 // NTFT uses high order bits #define PARTITION_NTFT 0x80 // NTFT partition +#define PARTITION_GPT 0xEE // GPT protective partition #ifdef __REACTOS__ #define PARTITION_OLD_LINUX 0x43 #define PARTITION_LINUX 0x83 @@ -144,18 +145,9 @@ extern SIZE_T DiskReadBufferSize; // /////////////////////////////////////////////////////////////////////////////////////// -/* Signature of DiskGetPartitionEntry(...) */ -typedef -BOOLEAN -(*DISK_GET_PARTITION_ENTRY)(UCHAR DriveNumber, - ULONG PartitionNumber, - PPARTITION_TABLE_ENTRY PartitionTableEntry); - -/* This function serves to retrieve a partition entry for devices that handle partitions differently */ -extern DISK_GET_PARTITION_ENTRY DiskGetPartitionEntry; - -BOOLEAN DiskGetActivePartitionEntry(UCHAR DriveNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry, ULONG *ActivePartition); -BOOLEAN DiskGetMbrPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); +VOID DiskDetectPartitionType(UCHAR DriveNumber); +BOOLEAN DiskGetBootPartitionEntry(UCHAR DriveNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry, ULONG *BootPartition); +BOOLEAN DiskGetPartitionEntry(UCHAR DriveNumber, ULONG PartitionNumber, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN DiskGetFirstPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN DiskGetFirstExtendedPartitionEntry(PMASTER_BOOT_RECORD MasterBootRecord, PPARTITION_TABLE_ENTRY PartitionTableEntry); BOOLEAN DiskReadBootRecord(UCHAR DriveNumber, ULONGLONG LogicalSectorNumber, PMASTER_BOOT_RECORD BootRecord); diff --git a/sdk/include/psdk/ntdddisk.h b/sdk/include/psdk/ntdddisk.h index 24387a02d54..13b8e0e9995 100644 --- a/sdk/include/psdk/ntdddisk.h +++ b/sdk/include/psdk/ntdddisk.h @@ -410,7 +410,11 @@ typedef struct _PARTITION_INFORMATION_GPT { typedef enum _PARTITION_STYLE { PARTITION_STYLE_MBR, PARTITION_STYLE_GPT, - PARTITION_STYLE_RAW + PARTITION_STYLE_RAW, +#ifdef __REACTOS__ + /* ReactOS custom partition handlers */ + PARTITION_STYLE_BRFR = 128 /* Xbox-BRFR partitioning scheme */ +#endif } PARTITION_STYLE; typedef struct _DISK_PARTITION_INFO {

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs