Ros-diffs August 2019

ros-diffs@reactos.org

36 participants
281 discussions

[reactos] 05/05: [WIN32SS] Ensure the last menu item is not accidentally selected when a system menu is off-screen CORE-16297

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6948764b21da483b7d0fb… commit 6948764b21da483b7d0fb6eab8dab0835525d906 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Aug 7 23:53:42 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 8 19:51:28 2019 +0200 [WIN32SS] Ensure the last menu item is not accidentally selected when a system menu is off-screen CORE-16297 --- win32ss/user/ntuser/menu.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 724501c2c5a..a826ddbc58c 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3405,6 +3405,8 @@ static PMENU FASTCALL MENU_ShowSubPopup(PWND WndOwner, PMENU Menu, BOOL SelectFi MENU_InitSysMenuPopup(Item->spSubMenu, pWnd->style, pWnd->pcls->style, HTSYSMENU); NC_GetSysPopupPos(pWnd, &Rect); + /* Ensure we do not overlap this */ + ParentRect = Rect; if (Flags & TPM_LAYOUTRTL) Rect.left = Rect.right; Rect.top = Rect.bottom; Rect.right = UserGetSystemMetrics(SM_CXSIZE);

5 years, 4 months

[reactos] 04/05: [WIN32SS] Do not propagate TPM_VERTICAL to sub-menus With this change we can remove the workaround from the off-screen menus dropping below their parent. Many thanks to Joachim for his help debugging / testing this.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84e263ceb231c3ae46ba1… commit 84e263ceb231c3ae46ba12c5aea677ba53d8d2fa Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Aug 7 22:14:58 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 8 19:51:28 2019 +0200 [WIN32SS] Do not propagate TPM_VERTICAL to sub-menus With this change we can remove the workaround from the off-screen menus dropping below their parent. Many thanks to Joachim for his help debugging / testing this. CORE-16297 --- win32ss/user/ntuser/menu.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index a4e76511431..724501c2c5a 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2879,8 +2879,10 @@ static void DebugRect(const RECT* rectl, COLORREF color) static void DebugPoint(INT x, INT y, COLORREF color) { - RECT rr = {x, y, x, y}; - DebugRect(&rr, color); + RECT r1 = {x-10, y, x+10, y}; + RECT r2 = {x, y-10, x, y+10}; + DebugRect(&r1, color); + DebugRect(&r2, color); } #endif @@ -3047,9 +3049,6 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl TPM_BOTTOMALIGN | TPM_RIGHTALIGN | TPM_VERTICAL, /* Then the other side again (still swapped hor/ver) */ }; - /* We should first try left / right, this flag is not needed as input */ - UINT tryFlags = flags & ~TPM_VERTICAL; - UINT n; for (n = 0; n < RTL_NUMBER_OF(flag_mods); ++n) { @@ -3057,7 +3056,7 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl INT ty = y; /* Try to move a bit around */ - if (MENU_MoveRect(tryFlags ^ flag_mods[n], &tx, &ty, width, height, &Cleaned, monitor) && + if (MENU_MoveRect(flags ^ flag_mods[n], &tx, &ty, width, height, &Cleaned, monitor) && !RECTL_Intersect(&Cleaned, tx, ty, width, height)) { x = tx; @@ -3447,6 +3446,12 @@ static PMENU FASTCALL MENU_ShowSubPopup(PWND WndOwner, PMENU Menu, BOOL SelectFi } } + /* Next menu does not need to be shown vertical anymore */ + if (Menu->fFlags & MNF_POPUP) + Flags &= (~TPM_VERTICAL); + + + /* use default alignment for submenus */ Flags &= ~(TPM_CENTERALIGN | TPM_RIGHTALIGN | TPM_VCENTERALIGN | TPM_BOTTOMALIGN); @@ -4471,7 +4476,7 @@ static BOOL FASTCALL MENU_ExitTracking(PWND pWnd, BOOL bPopup, UINT wFlags) VOID MENU_TrackMouseMenuBar( PWND pWnd, ULONG ht, POINT pt) { PMENU pMenu = (ht == HTSYSMENU) ? IntGetSystemMenu(pWnd, FALSE) : IntGetMenu( UserHMGetHandle(pWnd) ); // See 74276 and CORE-12801 - UINT wFlags = TPM_BUTTONDOWN | TPM_LEFTALIGN | TPM_LEFTBUTTON; + UINT wFlags = TPM_BUTTONDOWN | TPM_LEFTALIGN | TPM_LEFTBUTTON | TPM_VERTICAL; TRACE("wnd=%p ht=0x%04x (%ld,%ld)\n", pWnd, ht, pt.x, pt.y);

5 years, 4 months

[reactos] 03/05: [WIN32SS] Fix tray popup menus stuck to the bottom of the screen Dedicated to Joachim CORE-16297

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1c8cdaa470c3ebce01bc4… commit 1c8cdaa470c3ebce01bc4079ca1252569870c861 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Aug 7 21:50:25 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 8 19:51:28 2019 +0200 [WIN32SS] Fix tray popup menus stuck to the bottom of the screen Dedicated to Joachim CORE-16297 --- win32ss/user/ntuser/menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index cc628162aee..a4e76511431 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3027,7 +3027,7 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl /* And the bottom */ if (y + height > monitor->rcMonitor.bottom) { - if ((y - height) < monitor->rcMonitor.top || y >= monitor->rcMonitor.bottom || bIsPopup) + if ((y - height) < monitor->rcMonitor.top || y >= monitor->rcMonitor.bottom) y = monitor->rcMonitor.bottom - height; else y -= height;

5 years, 4 months

[reactos] 02/05: [WIN32SS] Fix off-screen menu's dropping below their parent

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=33f77af348c0aa6704f9e… commit 33f77af348c0aa6704f9ec0e9c08040dffd9f51f Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Aug 7 01:52:18 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 8 19:51:28 2019 +0200 [WIN32SS] Fix off-screen menu's dropping below their parent --- win32ss/user/ntuser/menu.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index ecf67761dd3..cc628162aee 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3046,6 +3046,10 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl TPM_VERTICAL, /* Then swap horizontal / vertical */ TPM_BOTTOMALIGN | TPM_RIGHTALIGN | TPM_VERTICAL, /* Then the other side again (still swapped hor/ver) */ }; + + /* We should first try left / right, this flag is not needed as input */ + UINT tryFlags = flags & ~TPM_VERTICAL; + UINT n; for (n = 0; n < RTL_NUMBER_OF(flag_mods); ++n) { @@ -3053,7 +3057,7 @@ static BOOL FASTCALL MENU_ShowPopup(PWND pwndOwner, PMENU menu, UINT id, UINT fl INT ty = y; /* Try to move a bit around */ - if (MENU_MoveRect(flags ^ flag_mods[n], &tx, &ty, width, height, &Cleaned, monitor) && + if (MENU_MoveRect(tryFlags ^ flag_mods[n], &tx, &ty, width, height, &Cleaned, monitor) && !RECTL_Intersect(&Cleaned, tx, ty, width, height)) { x = tx; @@ -3361,6 +3365,9 @@ static PMENU FASTCALL MENU_ShowSubPopup(PWND WndOwner, PMENU Menu, BOOL SelectFi ERR("No pWnd\n"); ParentRect = Rect; } + + /* Ensure we can slightly overlap our parent */ + RECTL_vInflateRect(&ParentRect, -UserGetSystemMetrics(SM_CXEDGE) * 2, 0); } else {

5 years, 4 months

[reactos] 01/05: [WIN32SS] For application menu's, only exclude the menu item, not the entire window. Because the application menu is part of the application window, this would lead to bad results.

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3cbdcc6363666db43ec82… commit 3cbdcc6363666db43ec82cd119f7f2536470fa93 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Wed Aug 7 00:50:21 2019 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Thu Aug 8 19:51:15 2019 +0200 [WIN32SS] For application menu's, only exclude the menu item, not the entire window. Because the application menu is part of the application window, this would lead to bad results. --- win32ss/user/ntuser/menu.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 13af632520d..ecf67761dd3 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -3354,10 +3354,20 @@ static PMENU FASTCALL MENU_ShowSubPopup(PWND WndOwner, PMENU Menu, BOOL SelectFi pWnd = ValidateHwndNoErr(Menu->hWnd); /* Grab the rect of our (entire) parent menu, so we can try to not overlap it */ - if (!IntGetWindowRect(pWnd, &ParentRect)) + if (Menu->fFlags & MNF_POPUP) { - ERR("No pWnd\n"); - ParentRect = Rect; + if (!IntGetWindowRect(pWnd, &ParentRect)) + { + ERR("No pWnd\n"); + ParentRect = Rect; + } + } + else + { + /* Inside the menu bar, we do not want to grab the entire window... */ + ParentRect = Rect; + if (pWnd) + RECTL_vOffsetRect(&ParentRect, pWnd->rcWindow.left, pWnd->rcWindow.top); } /* correct item if modified as a reaction to WM_INITMENUPOPUP message */

5 years, 4 months

[reactos] 01/01: [FONTVIEW] Broadcast WM_FONTCHANGE message (#1815)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7e39f7d2ad68b26cce7d… commit f7e39f7d2ad68b26cce7d3e3cbc4bf6867bd564c Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 8 21:41:15 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 8 21:41:15 2019 +0900 [FONTVIEW] Broadcast WM_FONTCHANGE message (#1815) We have to send WM_FONTCHANGE message when the font list was changed. --- base/applications/fontview/fontview.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/base/applications/fontview/fontview.c b/base/applications/fontview/fontview.c index fe0bf8aa304..1deac6e8db2 100644 --- a/base/applications/fontview/fontview.c +++ b/base/applications/fontview/fontview.c @@ -515,6 +515,9 @@ MainWnd_OnInstall(HWND hwnd) /* Close the fonts key */ RegCloseKey(hKey); + /* Broadcast WM_FONTCHANGE message */ + SendMessageW(HWND_BROADCAST, WM_FONTCHANGE, 0, 0); + /* if all of this goes correctly, message the user about success */ MessageBoxW(hwnd, L"Font Installation Completed.", L"Success", MB_OK);

5 years, 4 months

[reactos] 01/01: [WIN32SS][NTUSER] Fix MENU_DrawScrollArrows (#1753)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=65e4efd475e98b970fa5a… commit 65e4efd475e98b970fa5add48a13fd6360997d62 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Thu Aug 8 13:56:23 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Thu Aug 8 13:56:23 2019 +0900 [WIN32SS][NTUSER] Fix MENU_DrawScrollArrows (#1753) Fix drawing the menu scrolling arrows. CORE-13211 --- win32ss/user/ntuser/menu.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 3ff90e9e330..13af632520d 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -2177,11 +2177,10 @@ static void MENU_MenuBarCalcSize( HDC hdc, LPRECT lprect, PMENU lppop, PWND pwnd */ static void MENU_DrawScrollArrows(PMENU lppop, HDC hdc) { - UINT arrow_bitmap_width, arrow_bitmap_height; - RECT rect, dfcrc; + UINT arrow_bitmap_height; + RECT rect; UINT Flags = 0; - arrow_bitmap_width = gpsi->oembmi[OBI_DNARROW].cx; arrow_bitmap_height = gpsi->oembmi[OBI_DNARROW].cy; rect.left = 0; @@ -2189,22 +2188,14 @@ static void MENU_DrawScrollArrows(PMENU lppop, HDC hdc) rect.right = lppop->cxMenu; rect.bottom = arrow_bitmap_height; FillRect(hdc, &rect, IntGetSysColorBrush(COLOR_MENU)); - dfcrc.left = (lppop->cxMenu - arrow_bitmap_width) / 2; - dfcrc.top = 0; - dfcrc.right = arrow_bitmap_width; - dfcrc.bottom = arrow_bitmap_height; - DrawFrameControl(hdc, &dfcrc, DFC_MENU, (lppop->iTop ? 0 : DFCS_INACTIVE)|DFCS_MENUARROWUP); + DrawFrameControl(hdc, &rect, DFC_MENU, (lppop->iTop ? 0 : DFCS_INACTIVE)|DFCS_MENUARROWUP); rect.top = lppop->cyMenu - arrow_bitmap_height; rect.bottom = lppop->cyMenu; FillRect(hdc, &rect, IntGetSysColorBrush(COLOR_MENU)); if (!(lppop->iTop < lppop->iMaxTop - (MENU_GetMaxPopupHeight(lppop) - 2 * arrow_bitmap_height))) Flags = DFCS_INACTIVE; - dfcrc.left = (lppop->cxMenu - arrow_bitmap_width) / 2; - dfcrc.top = lppop->cyMenu - arrow_bitmap_height; - dfcrc.right = arrow_bitmap_width; - dfcrc.bottom = lppop->cyMenu; - DrawFrameControl(hdc, &dfcrc, DFC_MENU, Flags|DFCS_MENUARROWDOWN); + DrawFrameControl(hdc, &rect, DFC_MENU, Flags|DFCS_MENUARROWDOWN); } /***********************************************************************

5 years, 4 months

[reactos] 01/01: [FREELDR] Verbose error output for FS errors

by Victor Perevertkin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=304e2810995da20d53b5a… commit 304e2810995da20d53b5acf8f0b664274d0b895b Author: Victor Perevertkin <victor(a)perevertkin.ru> AuthorDate: Mon Jul 29 23:25:03 2019 +0300 Commit: Victor Perevertkin <victor(a)perevertkin.ru> CommitDate: Thu Aug 8 02:33:10 2019 +0300 [FREELDR] Verbose error output for FS errors --- boot/freeldr/freeldr/lib/inifile/ini_init.c | 2 ++ boot/freeldr/freeldr/lib/peloader.c | 10 +++++---- boot/freeldr/freeldr/ntldr/winldr.c | 2 ++ boot/freeldr/freeldr/ntldr/wlregistry.c | 34 ++++++++++++++++++++++++++--- 4 files changed, 41 insertions(+), 7 deletions(-) diff --git a/boot/freeldr/freeldr/lib/inifile/ini_init.c b/boot/freeldr/freeldr/lib/inifile/ini_init.c index 4db18a42908..52a24bcdfdc 100644 --- a/boot/freeldr/freeldr/lib/inifile/ini_init.c +++ b/boot/freeldr/freeldr/lib/inifile/ini_init.c @@ -51,6 +51,7 @@ BOOLEAN IniFileInitialize(VOID) Status = IniOpenIniFile(&FileId); if (Status != ESUCCESS) { + ERR("Error while opening freeldr.ini, Status: %d\n", Status); UiMessageBoxCritical("Error opening freeldr.ini or file not found.\nYou need to re-install FreeLoader."); return FALSE; } @@ -83,6 +84,7 @@ BOOLEAN IniFileInitialize(VOID) Status = ArcRead(FileId, FreeLoaderIniFileData, FreeLoaderIniFileSize, &Count); if (Status != ESUCCESS || Count != FreeLoaderIniFileSize) { + ERR("Error while reading freeldr.ini, Status: %d\n", Status); UiMessageBoxCritical("Error while reading freeldr.ini."); ArcClose(FileId); FrLdrTempFree(FreeLoaderIniFileData, TAG_INI_FILE); diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index ac61aba1a9f..7f913f1c8d6 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -287,7 +287,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcOpen(FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { - // UiMessageBox("Can not open the file."); + WARN("Error while opening '%s', Status: %u\n", FileName, Status); return FALSE; } @@ -295,6 +295,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcRead(FileId, HeadersBuffer, SECTOR_SIZE * 2, &BytesRead); if (Status != ESUCCESS) { + WARN("Error while reading '%s', Status: %u\n", FileName, Status); UiMessageBox("Error reading from file."); ArcClose(FileId); return FALSE; @@ -348,11 +349,12 @@ WinLdrLoadImage(IN PCHAR FileName, TRACE("Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase); /* Set to 0 position and fully load the file image */ - Position.HighPart = Position.LowPart = 0; + Position.QuadPart = 0; Status = ArcSeek(FileId, &Position, SeekAbsolute); if (Status != ESUCCESS) { - UiMessageBox("Error seeking to start of file."); + WARN("Error while seeking '%s', Status: %u\n", FileName, Status); + UiMessageBox("Error seeking the start of a file."); ArcClose(FileId); return FALSE; } @@ -360,7 +362,7 @@ WinLdrLoadImage(IN PCHAR FileName, Status = ArcRead(FileId, PhysicalBase, NtHeaders->OptionalHeader.SizeOfHeaders, &BytesRead); if (Status != ESUCCESS) { - // Print(L"Error reading headers %s\n", FileName); + WARN("Error while reading '%s', Status: %u\n", FileName, Status); UiMessageBox("Error reading headers."); ArcClose(FileId); return FALSE; diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 98de7f29922..47649d5c028 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -369,6 +369,7 @@ WinLdrLoadModule(PCSTR ModuleName, if (Status != ESUCCESS) { /* In case of errors, we just return, without complaining to the user */ + WARN("Error while opening '%s', Status: %u\n", ModuleName, Status); return NULL; } @@ -395,6 +396,7 @@ WinLdrLoadModule(PCSTR ModuleName, ArcClose(FileId); if (Status != ESUCCESS) { + WARN("Error while reading '%s', Status: %u\n", ModuleName, Status); return NULL; } diff --git a/boot/freeldr/freeldr/ntldr/wlregistry.c b/boot/freeldr/freeldr/ntldr/wlregistry.c index 3f813819dfc..8c78e60608c 100644 --- a/boot/freeldr/freeldr/ntldr/wlregistry.c +++ b/boot/freeldr/freeldr/ntldr/wlregistry.c @@ -49,10 +49,11 @@ WinLdrLoadSystemHive( /* Concatenate path and filename to get the full name */ strcpy(FullHiveName, DirectoryPath); strcat(FullHiveName, HiveName); - //Print(L"Loading %s...\n", FullHiveName); + Status = ArcOpen(FullHiveName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { + WARN("Error while opening '%s', Status: %u\n", FullHiveName, Status); UiMessageBox("Opening hive file failed!"); return FALSE; } @@ -91,6 +92,7 @@ WinLdrLoadSystemHive( if (Status != ESUCCESS) { ArcClose(FileId); + WARN("Error while reading '%s', Status: %u\n", FullHiveName, Status); UiMessageBox("Unable to read from hive file!"); return FALSE; } @@ -320,12 +322,14 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, AnsiEqualsOem = TRUE; /* Open file with ANSI and store its size */ - //Print(L"Loading %s...\n", Filename); strcpy(FileName, DirectoryPath); strcat(FileName, AnsiFileName); Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); if (Status != ESUCCESS) + { + WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; + } Status = ArcGetFileInformation(AnsiFileId, &FileInfo); if (Status != ESUCCESS) @@ -346,7 +350,10 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, strcat(FileName, OemFileName); Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); if (Status != ESUCCESS) + { + WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; + } Status = ArcGetFileInformation(OemFileId, &FileInfo); if (Status != ESUCCESS) @@ -362,7 +369,10 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, strcat(FileName, LanguageFileName); Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); if (Status != ESUCCESS) + { + WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; + } Status = ArcGetFileInformation(LanguageFileId, &FileInfo); if (Status != ESUCCESS) @@ -403,11 +413,17 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, strcat(FileName, AnsiFileName); Status = ArcOpen(FileName, OpenReadOnly, &AnsiFileId); if (Status != ESUCCESS) + { + WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; + } Status = ArcRead(AnsiFileId, VaToPa(LoaderBlock->NlsData->AnsiCodePageData), AnsiFileSize, &BytesRead); if (Status != ESUCCESS) + { + WARN("Error while reading '%s', Status: %u\n", FileName, Status); goto Failure; + } ArcClose(AnsiFileId); @@ -418,11 +434,17 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, strcat(FileName, OemFileName); Status = ArcOpen(FileName, OpenReadOnly, &OemFileId); if (Status != ESUCCESS) + { + WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; + } Status = ArcRead(OemFileId, VaToPa(LoaderBlock->NlsData->OemCodePageData), OemFileSize, &BytesRead); if (Status != ESUCCESS) + { + WARN("Error while reading '%s', Status: %u\n", FileName, Status); goto Failure; + } ArcClose(OemFileId); } @@ -432,11 +454,17 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, strcat(FileName, LanguageFileName); Status = ArcOpen(FileName, OpenReadOnly, &LanguageFileId); if (Status != ESUCCESS) + { + WARN("Error while opening '%s', Status: %u\n", FileName, Status); goto Failure; + } Status = ArcRead(LanguageFileId, VaToPa(LoaderBlock->NlsData->UnicodeCodePageData), LanguageFileSize, &BytesRead); if (Status != ESUCCESS) + { + WARN("Error while reading '%s', Status: %u\n", FileName, Status); goto Failure; + } ArcClose(LanguageFileId); @@ -841,7 +869,7 @@ WinLdrAddDriverToList(LIST_ENTRY *BootDriverListHead, if (!NT_SUCCESS(Status)) return FALSE; - // Insert entry into the list + // Insert entry into the list if (!InsertInBootDriverList(BootDriverListHead, BootDriverEntry)) { // It was already there, so delete our entry

5 years, 4 months

[reactos] 01/01: [FREELDR] Better fix for x64. Addendum to 268cdf57.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bc3314d4aa64d58222e5a… commit bc3314d4aa64d58222e5a0941293f0447a16903d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 7 19:30:55 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 7 19:30:55 2019 +0200 [FREELDR] Better fix for x64. Addendum to 268cdf57. --- boot/freeldr/freeldr/CMakeLists.txt | 2 +- boot/freeldr/freeldr/arch/i386/drivemap.c | 126 ++++++++++++---------- boot/freeldr/freeldr/include/arch/i386/drivemap.h | 27 +++-- boot/freeldr/freeldr/include/freeldr.h | 2 +- 4 files changed, 87 insertions(+), 70 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 05489b3bda6..d4263050ad4 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -154,7 +154,7 @@ elseif(ARCH STREQUAL "amd64") list(APPEND FREELDR_ARC_SOURCE lib/fs/pxe.c arch/i386/ntoskrnl.c - # arch/i386/drivemap.c + arch/i386/drivemap.c arch/i386/hardware.c arch/i386/hwacpi.c arch/i386/hwapm.c diff --git a/boot/freeldr/freeldr/arch/i386/drivemap.c b/boot/freeldr/freeldr/arch/i386/drivemap.c index f03d14e783e..2d38f346e28 100644 --- a/boot/freeldr/freeldr/arch/i386/drivemap.c +++ b/boot/freeldr/freeldr/arch/i386/drivemap.c @@ -22,11 +22,76 @@ DBG_DEFAULT_CHANNEL(DISK); +#ifdef _M_IX86 + BOOLEAN DriveMapInstalled = FALSE; // Tells us if we have already installed our drive map int 13h handler code ULONG OldInt13HandlerAddress = 0; // Address of BIOS int 13h handler ULONG DriveMapHandlerAddress = 0; // Linear address of our drive map handler ULONG DriveMapHandlerSegOff = 0; // Segment:offset style address of our drive map handler +#endif // _M_IX86 + +BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString) +{ + ULONG Index; + + // Now verify that the user has given us appropriate strings + if ((strlen(DriveString) < 3) || + ((DriveString[0] != 'f') && (DriveString[0] != 'F') && + (DriveString[0] != 'h') && (DriveString[0] != 'H')) || + ((DriveString[1] != 'd') && (DriveString[1] != 'D'))) + { + return FALSE; + } + + // Now verify that the user has given us appropriate numbers + // Make sure that only numeric characters were given + for (Index = 2; Index < strlen(DriveString); Index++) + { + if (DriveString[Index] < '0' || DriveString[Index] > '9') + { + return FALSE; + } + } + + // Now make sure that they are not outrageous values (i.e. hd90874) + if ((atoi(&DriveString[2]) < 0) || (atoi(&DriveString[2]) > 0xff)) + { + return FALSE; + } + + return TRUE; +} + +UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName) +{ + UCHAR BiosDriveNumber = 0; + + TRACE("DriveMapGetBiosDriveNumber(%s)\n", DeviceName); + + // If they passed in a number string then just + // convert it to decimal and return it + if (DeviceName[0] >= '0' && DeviceName[0] <= '9') + { + return (UCHAR)strtoul(DeviceName, NULL, 0); + } + + // Convert the drive number string into a number + // 'hd1' = 1 + BiosDriveNumber = atoi(&DeviceName[2]); + + // If it's a hard disk then set the high bit + if ((DeviceName[0] == 'h' || DeviceName[0] == 'H') && + (DeviceName[1] == 'd' || DeviceName[1] == 'D')) + { + BiosDriveNumber |= 0x80; + } + + return BiosDriveNumber; +} + +#ifdef _M_IX86 + VOID DriveMapMapDrivesInSection(PCSTR SectionName) { CHAR SettingName[80]; @@ -111,65 +176,6 @@ VOID DriveMapMapDrivesInSection(PCSTR SectionName) } } -BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString) -{ - ULONG Index; - - // Now verify that the user has given us appropriate strings - if ((strlen(DriveString) < 3) || - ((DriveString[0] != 'f') && (DriveString[0] != 'F') && - (DriveString[0] != 'h') && (DriveString[0] != 'H')) || - ((DriveString[1] != 'd') && (DriveString[1] != 'D'))) - { - return FALSE; - } - - // Now verify that the user has given us appropriate numbers - // Make sure that only numeric characters were given - for (Index = 2; Index < strlen(DriveString); Index++) - { - if (DriveString[Index] < '0' || DriveString[Index] > '9') - { - return FALSE; - } - } - - // Now make sure that they are not outrageous values (i.e. hd90874) - if ((atoi(&DriveString[2]) < 0) || (atoi(&DriveString[2]) > 0xff)) - { - return FALSE; - } - - return TRUE; -} - -UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName) -{ - UCHAR BiosDriveNumber = 0; - - TRACE("DriveMapGetBiosDriveNumber(%s)\n", DeviceName); - - // If they passed in a number string then just - // convert it to decimal and return it - if (DeviceName[0] >= '0' && DeviceName[0] <= '9') - { - return (UCHAR)strtoul(DeviceName, NULL, 0); - } - - // Convert the drive number string into a number - // 'hd1' = 1 - BiosDriveNumber = atoi(&DeviceName[2]); - - // If it's a hard disk then set the high bit - if ((DeviceName[0] == 'h' || DeviceName[0] == 'H') && - (DeviceName[1] == 'd' || DeviceName[1] == 'D')) - { - BiosDriveNumber |= 0x80; - } - - return BiosDriveNumber; -} - VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap) { ULONG* RealModeIVT = (ULONG*)UlongToPtr(0x00000000); @@ -225,3 +231,5 @@ VOID DriveMapRemoveInt13Handler(VOID) DriveMapInstalled = FALSE; } } + +#endif // _M_IX86 diff --git a/boot/freeldr/freeldr/include/arch/i386/drivemap.h b/boot/freeldr/freeldr/include/arch/i386/drivemap.h index c999649a746..8c1d1088523 100644 --- a/boot/freeldr/freeldr/include/arch/i386/drivemap.h +++ b/boot/freeldr/freeldr/include/arch/i386/drivemap.h @@ -19,21 +19,30 @@ #pragma once +#ifdef _M_IX86 + #include <pshpack1.h> typedef struct { - UCHAR DriveMapCount; // Count of drives currently mapped - CHAR DriveMap[8]; // Map of BIOS drives + UCHAR DriveMapCount; // Count of drives currently mapped + CHAR DriveMap[8]; // Map of BIOS drives } DRIVE_MAP_LIST, *PDRIVE_MAP_LIST; #include <poppack.h> -VOID DriveMapMapDrivesInSection(PCSTR SectionName); -BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString); // Checks the drive string ("hd0") for validity -UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName); // Returns a BIOS drive number for any given device name (e.g. 0x80 for 'hd0') -VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap); // Installs the int 13h handler for the drive mapper -VOID DriveMapRemoveInt13Handler(VOID); // Removes a previously installed int 13h drive map handler +#endif // _M_IX86 + +BOOLEAN DriveMapIsValidDriveString(PCSTR DriveString); // Checks the drive string ("hd0") for validity +UCHAR DriveMapGetBiosDriveNumber(PCSTR DeviceName); // Returns a BIOS drive number for any given device name (e.g. 0x80 for 'hd0') + +#ifdef _M_IX86 + +VOID DriveMapMapDrivesInSection(PCSTR SectionName); +VOID DriveMapInstallInt13Handler(PDRIVE_MAP_LIST DriveMap); // Installs the int 13h handler for the drive mapper +VOID DriveMapRemoveInt13Handler(VOID); // Removes a previously installed int 13h drive map handler extern PVOID DriveMapInt13HandlerStart; extern PVOID DriveMapInt13HandlerEnd; -extern ULONG DriveMapOldInt13HandlerAddress; -extern DRIVE_MAP_LIST DriveMapInt13HandlerMapList; +extern ULONG DriveMapOldInt13HandlerAddress; +extern DRIVE_MAP_LIST DriveMapInt13HandlerMapList; + +#endif // _M_IX86 diff --git a/boot/freeldr/freeldr/include/freeldr.h b/boot/freeldr/freeldr/include/freeldr.h index 0ef42e40595..841fd4c64ee 100644 --- a/boot/freeldr/freeldr/include/freeldr.h +++ b/boot/freeldr/freeldr/include/freeldr.h @@ -107,10 +107,10 @@ #include <arch/pc/machpc.h> #include <arch/pc/x86common.h> #include <arch/pc/pxe.h> +#include <arch/i386/drivemap.h> #endif #if defined(_M_IX86) #include <arch/i386/i386.h> -#include <arch/i386/drivemap.h> #include <arch/i386/machxbox.h> #include <internal/i386/intrin_i.h> #elif defined(_M_AMD64)

5 years, 4 months

[reactos] 01/01: [FREELDR] Fix EditBox initial string display length: do not count the NULL-terminator.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15bf4d18d6aa54bc0050f… commit 15bf4d18d6aa54bc0050fde7f1ef69f49eb82173 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Aug 7 19:18:04 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Aug 7 19:18:04 2019 +0200 [FREELDR] Fix EditBox initial string display length: do not count the NULL-terminator. --- boot/freeldr/freeldr/ui/tui.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index b39e6fbc36d..8fd16aabc72 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -877,8 +877,8 @@ BOOLEAN TuiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length) temp[j++] = MessageText[i]; } - EditBoxTextLength = (ULONG)strlen(EditTextBuffer) + 1; - EditBoxTextLength = min(EditBoxTextLength, Length); + EditBoxTextLength = (ULONG)strlen(EditTextBuffer); + EditBoxTextLength = min(EditBoxTextLength, Length - 1); EditBoxTextPosition = 0; EditBoxLine = y2 - 2; EditBoxStartX = x1 + 3;

5 years, 4 months

← Newer
1
...
19
20
21
22
23
24
25
...
29
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 August 2019