Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [WIN32SS][NTUSER] Fix hit test position of popup menu
by Katayama Hirofumi MZ 21 Sep '19

21 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81e27f0be79fb92127d02… commit 81e27f0be79fb92127d028ecaa876a2a187bbf87 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Sep 21 18:21:17 2019 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Sep 21 18:21:17 2019 +0900 [WIN32SS][NTUSER] Fix hit test position of popup menu The submenu of desktop popup menu was erroneously shown at first right click. - Fix the hit test position that was modified by window style change. CORE-16382 --- win32ss/user/ntuser/menu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index ae98cf0f57c..b7c550bec3a 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -1480,11 +1480,16 @@ MENU_AdjustMenuItemRect(PMENU menu, PRECTL rect) static ITEM *MENU_FindItemByCoords( MENU *menu, POINT pt, UINT *pos ) { ITEM *item; - UINT i; + UINT i, cx, cy; RECT rect; PWND pWnd = ValidateHwndNoErr(menu->hWnd); if (!IntGetWindowRect(pWnd, &rect)) return NULL; + + cx = UserGetSystemMetrics(SM_CXDLGFRAME); + cy = UserGetSystemMetrics(SM_CYDLGFRAME); + RECTL_vInflateRect(&rect, -cx, -cy); + if (pWnd->ExStyle & WS_EX_LAYOUTRTL) pt.x = rect.right - 1 - pt.x; else

1 0

[reactos] 01/01: OOPS - Nothing to see there :P
by Hermès Bélusca-Maïto 21 Sep '19

21 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dff75d7162ff651dea5a7… commit dff75d7162ff651dea5a7558b7ca869afc292fb9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 21 04:38:47 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 21 04:38:47 2019 +0200 OOPS - Nothing to see there :P Revert commit 16a35353. --- boot/bootdata/txtsetup.sif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index e8c550ff6c9..82247b5a154 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -209,7 +209,7 @@ Cabinet=reactos.cab [SetupData] DefaultPath = \ReactOS OsLoadOptions = "/NOGUIBOOT /NODEBUG" -DbgOsLoadOptions = "/NOGUIBOOT /DEBUG /DEBUGPORT=VBOX /FIRSTCHANCE" +DbgOsLoadOptions = "/NOGUIBOOT /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE" ;DbgOsLoadOptions = "/SOS /DEBUGPORT=SCREEN" ;DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS"

1 0

[reactos] 02/02: [UBTRFS] Addendum to 255ef2c3: Add missing exports expected by mkbtrfs. CORE-16383 CORE-16354
by Hermès Bélusca-Maïto 21 Sep '19

21 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7fccd6b763e7c52a419a6… commit 7fccd6b763e7c52a419a652719b8f25235bb9de9 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Sep 21 04:35:01 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 21 04:35:01 2019 +0200 [UBTRFS] Addendum to 255ef2c3: Add missing exports expected by mkbtrfs. CORE-16383 CORE-16354 --- dll/win32/ubtrfs/ubtrfs.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/win32/ubtrfs/ubtrfs.spec b/dll/win32/ubtrfs/ubtrfs.spec index d36ea230f99..b797157b4c2 100644 --- a/dll/win32/ubtrfs/ubtrfs.spec +++ b/dll/win32/ubtrfs/ubtrfs.spec @@ -1,2 +1,6 @@ @ stdcall ChkdskEx(ptr long long long long ptr) BtrfsChkdskEx @ stdcall FormatEx(ptr long ptr long long ptr) BtrfsFormatEx + +@ stdcall GetFilesystemInformation(long long ptr) +@ stdcall SetIncompatFlags(int64) +@ stdcall SetSizes(long long)

1 0

[reactos] 01/02: WIP testing ISO
by Hermès Bélusca-Maïto 21 Sep '19

21 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=16a3535378cd4506331ca… commit 16a3535378cd4506331ca8b8b2fc1fc6a2c4f59c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Sep 12 16:44:53 2019 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sat Sep 21 04:28:28 2019 +0200 WIP testing ISO --- boot/bootdata/txtsetup.sif | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/bootdata/txtsetup.sif b/boot/bootdata/txtsetup.sif index 82247b5a154..e8c550ff6c9 100644 --- a/boot/bootdata/txtsetup.sif +++ b/boot/bootdata/txtsetup.sif @@ -209,7 +209,7 @@ Cabinet=reactos.cab [SetupData] DefaultPath = \ReactOS OsLoadOptions = "/NOGUIBOOT /NODEBUG" -DbgOsLoadOptions = "/NOGUIBOOT /KDSERIAL /DEBUGPORT=COM1 /FIRSTCHANCE" +DbgOsLoadOptions = "/NOGUIBOOT /DEBUG /DEBUGPORT=VBOX /FIRSTCHANCE" ;DbgOsLoadOptions = "/SOS /DEBUGPORT=SCREEN" ;DbgOsLoadOptions = "/NOGUIBOOT /DEBUGPORT=BOCHS"

1 0

[reactos] 01/01: [OPENGLCFG] Add italian translation. (#1915)
by Carlo Bramini 20 Sep '19

20 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec81c75b493206139ce3a… commit ec81c75b493206139ce3a9db9ebbc729e5e4e99b Author: Carlo Bramini <30959007+carlo-bramini(a)users.noreply.github.com> AuthorDate: Fri Sep 20 21:51:33 2019 +0200 Commit: Hermès BÉLUSCA - MAÏTO <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Sep 20 21:51:33 2019 +0200 [OPENGLCFG] Add italian translation. (#1915) --- dll/cpl/openglcfg/lang/it-IT.rc | 28 ++++++++++++++++++++++++++++ dll/cpl/openglcfg/openglcfg.rc | 3 +++ 2 files changed, 31 insertions(+) diff --git a/dll/cpl/openglcfg/lang/it-IT.rc b/dll/cpl/openglcfg/lang/it-IT.rc new file mode 100644 index 00000000000..58518a6acc7 --- /dev/null +++ b/dll/cpl/openglcfg/lang/it-IT.rc @@ -0,0 +1,28 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_PROPPAGEGENERAL DIALOGEX 0, 0, 246, 228 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Generale" +FONT 8, "MS Shell Dlg" +BEGIN + ICON IDI_CPLICON, IDI_CPLICON, 8, 0, 21, 20 + GROUPBOX "Impostazioni di rendering", -1, 5, 25, 230, 90 + LTEXT "&Renderer:", -1, 15, 42, 37, 10 + COMBOBOX IDC_RENDERER, 55, 40, 160, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Questo sostituirà le impostazioni predefinite del tuo driver video! Selezionare ""Predefinito"" per tornare alle impostazioni predefinite.", -1, 15, 60, 210, 40 + GROUPBOX "Debugging", -1, 5, 125, 230, 90 + LTEXT "DEBUGCHANNEL:", -1, 15, 142, 65, 10 + COMBOBOX IDC_DEBUG_OUTPUT, 80, 140, 135, 10, WS_TABSTOP | WS_VSCROLL | CBS_DROPDOWNLIST + LTEXT "Attiva/disattiva l'output di debug da OpenGL32.\n\nATTENZIONE: selezionando ""Imposta"" o ""Elimina"", il contenuto della variabile di ambiente DEBUGCHANNEL verrà sovrascritto!", -1, 15, 165, 210, 40 +END + +STRINGTABLE +BEGIN + IDS_RENDERER_DEFAULT "Predefinito" + IDS_RENDERER_RSWR "Implementazione software ReactOS" + IDS_CPLNAME "Configurazione OpenGL" + IDS_CPLDESCRIPTION "Configura il rendering OpenGL." + IDS_DEBUG_SET "Imposta" + IDS_DEBUG_CLEAR "Elimina" + IDS_DEBUG_DNM "Non modificare" +END diff --git a/dll/cpl/openglcfg/openglcfg.rc b/dll/cpl/openglcfg/openglcfg.rc index d6a8af99aff..d1fcc9a19dd 100644 --- a/dll/cpl/openglcfg/openglcfg.rc +++ b/dll/cpl/openglcfg/openglcfg.rc @@ -27,6 +27,9 @@ IDI_CPLICON ICON "resources/openglcfg.ico" #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 0

[reactos] 01/01: [COMCTL32] Updown Suppress the NM_RELEASEDCAPTURE notification CORE-14365
by Joachim Henze 20 Sep '19

20 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=841732e45c5abfc2572b8… commit 841732e45c5abfc2572b88b392c09decdc119bf7 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Sep 20 20:13:09 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Sep 20 20:13:09 2019 +0200 [COMCTL32] Updown Suppress the NM_RELEASEDCAPTURE notification CORE-14365 This fixes a strange toggle-back-effect in 'Zeckensacks Glide Wrapper 0.84c' by importing Wine commit https://source.winehq.org/git/wine.git/commit/9dbe886e3ffd1c38a89f9cf256b7d… Thanks to patches author Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dll/win32/comctl32/updown.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/dll/win32/comctl32/updown.c b/dll/win32/comctl32/updown.c index 8dec7a4807a..6b328ff90f9 100644 --- a/dll/win32/comctl32/updown.c +++ b/dll/win32/comctl32/updown.c @@ -781,14 +781,8 @@ static BOOL UPDOWN_CancelMode (UPDOWN_INFO *infoPtr) KillTimer (infoPtr->Self, TIMER_ACCEL); KillTimer (infoPtr->Self, TIMER_AUTOPRESS); - if (GetCapture() == infoPtr->Self) { - NMHDR hdr; - hdr.hwndFrom = infoPtr->Self; - hdr.idFrom = GetWindowLongPtrW (infoPtr->Self, GWLP_ID); - hdr.code = NM_RELEASEDCAPTURE; - SendMessageW(infoPtr->Notify, WM_NOTIFY, hdr.idFrom, (LPARAM)&hdr); - ReleaseCapture(); - } + if (GetCapture() == infoPtr->Self) + ReleaseCapture(); infoPtr->Flags &= ~FLAG_PRESSED; InvalidateRect (infoPtr->Self, NULL, FALSE);

1 0

[reactos] 01/01: [THEMES] Add italian translations (#1913)
by Carlo Bramini 20 Sep '19

20 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=adfef44688a3d0538b29f… commit adfef44688a3d0538b29fb9e8da28ffd3b788bb5 Author: Carlo Bramini <30959007+carlo-bramini(a)users.noreply.github.com> AuthorDate: Fri Sep 20 14:33:56 2019 +0200 Commit: Robert Naumann <gonzomdx(a)gmail.com> CommitDate: Fri Sep 20 14:33:56 2019 +0200 [THEMES] Add italian translations (#1913) * Include italian translation * Include italian translation * Add italian translation * Add italian translation --- .../Blackshade/blackshade.msstyles/blackshade.rc | 3 ++ .../Blackshade/blackshade.msstyles/lang/it-IT.rc | 37 +++++++++++++++++++++ media/themes/Lunar/lunar.msstyles/lang/it-IT.rc | 38 ++++++++++++++++++++++ media/themes/Lunar/lunar.msstyles/lunar.rc | 3 ++ 4 files changed, 81 insertions(+) diff --git a/media/themes/Blackshade/blackshade.msstyles/blackshade.rc b/media/themes/Blackshade/blackshade.msstyles/blackshade.rc index 76cb575c8e2..d9a486b8da0 100644 --- a/media/themes/Blackshade/blackshade.msstyles/blackshade.rc +++ b/media/themes/Blackshade/blackshade.msstyles/blackshade.rc @@ -186,6 +186,9 @@ NORMAL_NORMALGROUPEXPAND_BMP BITMAP "bitmaps/dummy.bmp" #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif diff --git a/media/themes/Blackshade/blackshade.msstyles/lang/it-IT.rc b/media/themes/Blackshade/blackshade.msstyles/lang/it-IT.rc new file mode 100644 index 00000000000..c74a4cb38e9 --- /dev/null +++ b/media/themes/Blackshade/blackshade.msstyles/lang/it-IT.rc @@ -0,0 +1,37 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ +1000, "Black Shade" +} + +STRINGTABLE +{ +2000, "Black Shade" +} + +STRINGTABLE +{ +3000, "Normale" +3001, "Caratteri grandi" +3002, "Caratteri molto grandi" +} + +STRINGTABLE +{ +4000, "Normale" +4001, "Caratteri grandi" +4002, "Caratteri molto grandi" +} + +STRINGTABLE +{ +5000, "Black Shade" +5001, "Stile di visualizzazione" +5002, "ReactOS Foundation" +5003, "Immagini di David Quintana <gigaherz(a)gmail.com>" +5004, "Immagini rilasciate sotto licenza CC-BY-SA 4.0" +5005, "http://www.reactos.org" +5006, "1.0" +5007, "Stile di visualizzazione per ReactOS" +} diff --git a/media/themes/Lunar/lunar.msstyles/lang/it-IT.rc b/media/themes/Lunar/lunar.msstyles/lang/it-IT.rc new file mode 100644 index 00000000000..98ee4897f90 --- /dev/null +++ b/media/themes/Lunar/lunar.msstyles/lang/it-IT.rc @@ -0,0 +1,38 @@ +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +STRINGTABLE +{ +1000, "ReactOS" +} + +STRINGTABLE +{ +2000, "Lunar ReactOS" +} + +STRINGTABLE +{ +3000, "Normale" +3001, "Caratteri grandi" +3002, "Caratteri molto grandi" +} + +STRINGTABLE +{ +4000, "Normale" +4001, "Caratteri grandi" +4002, "Caratteri molto grandi" +} + +STRINGTABLE +{ +5000, "Lunar" +5001, "Stile di visualizzazione" +5002, "ReactOS Foundation" +5003, "Cernodile & Illen, basato su Lautus" +5004, "Distribuito sotto licenza GNU/GPL 2.0, 2019" +5005, "http://www.reactos.org" +5006, "1.1" +5007, "Stile di visualizzazione per ReactOS" +} + diff --git a/media/themes/Lunar/lunar.msstyles/lunar.rc b/media/themes/Lunar/lunar.msstyles/lunar.rc index 222d2b266af..b6820e4db20 100644 --- a/media/themes/Lunar/lunar.msstyles/lunar.rc +++ b/media/themes/Lunar/lunar.msstyles/lunar.rc @@ -181,6 +181,9 @@ NORMAL_NORMALGROUPEXPAND_BMP BITMAP "bitmaps/dummy.bmp" #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif #ifdef LANGUAGE_PL_PL #include "lang/pl-PL.rc" #endif

1 0

[reactos] 01/01: [IPCONFIG] Improve the 'Autoconfiguration Enabled' information
by Eric Kohl 20 Sep '19

20 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5539ca8d7e7d7f7cf7f52… commit 5539ca8d7e7d7f7cf7f52bd4d108a26495c20f0c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Fri Sep 20 09:24:49 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Fri Sep 20 09:25:49 2019 +0200 [IPCONFIG] Improve the 'Autoconfiguration Enabled' information - Show 'Autoconfiguration Enabled' only if DHCP is enabled for the adapter. - Retrieve and display the autoconfiguration state. --- base/applications/network/ipconfig/ipconfig.c | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/base/applications/network/ipconfig/ipconfig.c b/base/applications/network/ipconfig/ipconfig.c index d85dd313cb8..af8b1467a9a 100644 --- a/base/applications/network/ipconfig/ipconfig.c +++ b/base/applications/network/ipconfig/ipconfig.c @@ -407,6 +407,8 @@ VOID ShowInfo(BOOL bAll) ULONG adaptOutBufLen = 0; PFIXED_INFO pFixedInfo = NULL; ULONG netOutBufLen = 0; + PIP_PER_ADAPTER_INFO pPerAdapterInfo = NULL; + ULONG ulPerAdapterInfoLength = 0; ULONG ret = 0; /* call GetAdaptersInfo to obtain the adapter info */ @@ -495,6 +497,15 @@ VOID ShowInfo(BOOL bAll) if (myConType != NULL) HeapFree(ProcessHeap, 0, myConType); + if (GetPerAdapterInfo(pAdapter->Index, pPerAdapterInfo, &ulPerAdapterInfoLength) == ERROR_BUFFER_OVERFLOW) + { + pPerAdapterInfo = (PIP_PER_ADAPTER_INFO)HeapAlloc(ProcessHeap, 0, ulPerAdapterInfoLength); + if (pPerAdapterInfo != NULL) + { + GetPerAdapterInfo(pAdapter->Index, pPerAdapterInfo, &ulPerAdapterInfoLength); + } + } + /* check if the adapter is connected to the media */ if (mibEntry.dwOperStatus != MIB_IF_OPER_STATUS_CONNECTED && mibEntry.dwOperStatus != MIB_IF_OPER_STATUS_OPERATIONAL) { @@ -515,10 +526,20 @@ VOID ShowInfo(BOOL bAll) if (bConnected) { if (pAdapter->DhcpEnabled) + { _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : Yes\n")); + if (pPerAdapterInfo != NULL) + { + if (pPerAdapterInfo->AutoconfigEnabled) + _tprintf(_T("\tAutoconfiguration Enabled . . . . : Yes\n")); + else + _tprintf(_T("\tAutoconfiguration Enabled . . . . : No\n")); + } + } else + { _tprintf(_T("\tDHCP Enabled. . . . . . . . . . . : No\n")); - _tprintf(_T("\tAutoconfiguration Enabled . . . . : \n")); + } } } @@ -565,8 +586,10 @@ VOID ShowInfo(BOOL bAll) } _tprintf(_T("\n")); - pAdapter = pAdapter->Next; + HeapFree(ProcessHeap, 0, pPerAdapterInfo); + pPerAdapterInfo = NULL; + pAdapter = pAdapter->Next; } HeapFree(ProcessHeap, 0, pFixedInfo);

1 0

[reactos] 01/01: [EXPLORER] Mitigate CORE-15760 'system menu may close unexpectedly'
by Joachim Henze 19 Sep '19

19 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d2976ca58e1409a9b6a23… commit d2976ca58e1409a9b6a2322db1157cc8d9f19fb8 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Fri Sep 20 00:11:10 2019 +0200 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Fri Sep 20 00:11:10 2019 +0200 [EXPLORER] Mitigate CORE-15760 'system menu may close unexpectedly' Looks like a race condition of the async part of SetForegroundWindow(). KVM https://reactos.org/testman/compare.php?ids=69065,69069 VBOX https://reactos.org/testman/compare.php?ids=69064,69068 I intend to merge that back into 0.4.12RC as well. --- base/shell/explorer/taskswnd.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/base/shell/explorer/taskswnd.cpp b/base/shell/explorer/taskswnd.cpp index 0a5d4db4424..deeb50f2547 100644 --- a/base/shell/explorer/taskswnd.cpp +++ b/base/shell/explorer/taskswnd.cpp @@ -1633,6 +1633,13 @@ public: ActivateTask(TaskItem->hWnd); + /* Wait up to 2 seconds for the window to process the foreground notification. */ + DWORD_PTR resultDummy; + if (!SendMessageTimeout(TaskItem->hWnd, WM_NULL, 0, 0, 0, 2000, &resultDummy)) + ERR("HandleTaskItemRightClick detected the window was unresponsive for 2 seconds, or was destroyed\n"); + if (GetForegroundWindow() != TaskItem->hWnd) + ERR("HandleTaskItemRightClick detected the window did not become foreground\n"); + ::SendMessageW(TaskItem->hWnd, WM_POPUPSYSTEMMENU, 0, MAKELPARAM(pt.x, pt.y)); }

1 0

[reactos] 01/01: [FREELDR] Hack: Boot ReactOS even when a cdrom-drive does not report a proper geometry
by Eric Kohl 19 Sep '19

19 Sep '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2ed695fc83296f206097b… commit 2ed695fc83296f206097b4ab82e64ab37793ff7b Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Thu Sep 19 23:24:43 2019 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Thu Sep 19 23:27:11 2019 +0200 [FREELDR] Hack: Boot ReactOS even when a cdrom-drive does not report a proper geometry We need to find a way to retrieve the LBA sector count of a drive, not only its CHS geometry. --- boot/freeldr/freeldr/arch/i386/hwdisk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/arch/i386/hwdisk.c b/boot/freeldr/freeldr/arch/i386/hwdisk.c index d67494d508d..1717bdbd2dd 100644 --- a/boot/freeldr/freeldr/arch/i386/hwdisk.c +++ b/boot/freeldr/freeldr/arch/i386/hwdisk.c @@ -225,7 +225,9 @@ DiskSeek(ULONG FileId, LARGE_INTEGER* Position, SEEKMODE SeekMode) /* Convert in number of sectors */ NewPosition.QuadPart /= Context->SectorSize; - if (NewPosition.QuadPart >= Context->SectorCount) + + /* HACK: CDROMs may have a SectorCount of 0 */ + if (Context->SectorCount != 0 && NewPosition.QuadPart >= Context->SectorCount) return EINVAL; Context->SectorNumber = NewPosition.QuadPart;

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