Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 01/01: [SHELLBTRFS] Properly fix AppVeyor build This reverts bb6fece
by Pierre Schweitzer 13 Nov '19

13 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=986f6a4b24745211b49ea… commit 986f6a4b24745211b49ea74c4317b9661473676b Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Nov 13 08:22:13 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Nov 13 08:22:13 2019 +0100 [SHELLBTRFS] Properly fix AppVeyor build This reverts bb6fece --- dll/shellext/shellbtrfs/devices.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dll/shellext/shellbtrfs/devices.cpp b/dll/shellext/shellbtrfs/devices.cpp index f044151721e..dfa10647256 100755 --- a/dll/shellext/shellbtrfs/devices.cpp +++ b/dll/shellext/shellbtrfs/devices.cpp @@ -237,16 +237,22 @@ static void find_devices(HWND hwnd, const GUID* guid, const mountmgr& mm, vector free(dli); } else { try { - std::vector<mountmgr_point> v; - v = mm.query_points(L"", L"", wstring_view(path.Buffer, path.Length / sizeof(WCHAR))); + auto v = mm.query_points(L"", L"", wstring_view(path.Buffer, path.Length / sizeof(WCHAR))); - for (size_t i = 0; i < v.size(); ++i) - { - const mountmgr_point& p = v[i]; +#ifndef __REACTOS__ + for (const auto& p : v) { if (p.symlink.length() == 14 && p.symlink.substr(0, dosdevices.length()) == dosdevices && p.symlink[13] == ':') { +#else + for(auto p = v.begin(); p != v.end(); ++p) { + if ((*p).symlink.length() == 14 && (*p).symlink.substr(0, dosdevices.length()) == dosdevices && (*p).symlink[13] == ':') { +#endif WCHAR dr[3]; +#ifndef __REACTOS__ dr[0] = p.symlink[12]; +#else + dr[0] = (*p).symlink[12]; +#endif dr[1] = ':'; dr[2] = 0;

1 0

[reactos] 01/01: [SHELLBTRFS] Fix build (don't use C++11 auto)
by Katayma Hirofumi MZ 13 Nov '19

13 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bb6feced9fd659d7811a4… commit bb6feced9fd659d7811a422b93ad4a07e9c6c3da Author: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Wed Nov 13 12:30:33 2019 +0900 Commit: Katayma Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> CommitDate: Wed Nov 13 12:30:33 2019 +0900 [SHELLBTRFS] Fix build (don't use C++11 auto) --- dll/shellext/shellbtrfs/devices.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dll/shellext/shellbtrfs/devices.cpp b/dll/shellext/shellbtrfs/devices.cpp index b17f9b25823..f044151721e 100755 --- a/dll/shellext/shellbtrfs/devices.cpp +++ b/dll/shellext/shellbtrfs/devices.cpp @@ -237,9 +237,12 @@ static void find_devices(HWND hwnd, const GUID* guid, const mountmgr& mm, vector free(dli); } else { try { - auto v = mm.query_points(L"", L"", wstring_view(path.Buffer, path.Length / sizeof(WCHAR))); + std::vector<mountmgr_point> v; + v = mm.query_points(L"", L"", wstring_view(path.Buffer, path.Length / sizeof(WCHAR))); - for (const auto& p : v) { + for (size_t i = 0; i < v.size(); ++i) + { + const mountmgr_point& p = v[i]; if (p.symlink.length() == 14 && p.symlink.substr(0, dosdevices.length()) == dosdevices && p.symlink[13] == ':') { WCHAR dr[3];

1 0

[reactos] 01/01: [NTOS:KDBG] Rewrite the TSS handling code in the backtrace function, removing limitations (and bugs) of the original code. CORE-16448, PR #2003. Supersedes PR #1997.
by Hermès Bélusca-Maïto 13 Nov '19

13 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d21ff0ed137d61b7881af… commit d21ff0ed137d61b7881af96dd1d6e14387ccb89b Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Oct 28 01:01:23 2019 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Wed Nov 13 02:14:48 2019 +0100 [NTOS:KDBG] Rewrite the TSS handling code in the backtrace function, removing limitations (and bugs) of the original code. CORE-16448, PR #2003. Supersedes PR #1997. This commit supersedes commit 6c5c7809 (r54503). The original code was checking for the NMI or Double-Fault TSS by comparing the current stack-traced EIP address with their corresponding trap handler address ranges. That method was actually buggy because nothing was ensuring that the trap handlers were in the "expected" order in the kernel binary (and in memory). Instead, we now can handle completely generic nested TSSes, instead of just the NMI or the Double-Fault ones. The way we proceed is by performing the full stack backtrace of the current TSS, then once finished we check whether this TSS is nested (has a parent). If so we change the (cached) current TSS to the latter, restarting the backtrace at the parent TSS' latest EIP. Examples of stack backtraces: ============================= - General Protection fault: <snip> *** Fatal System Error: 0x0000007f (0x0000000D,0x00000000,0x00000000,0x00000000) Entered debugger on embedded INT3 at 0x0008:0x80953528. kdb:> bt Eip: <ntoskrnl.exe:153529 (sdk/lib/rtl/i386/debug_asm.S:57 (RtlpBreakWithStatusInstruction))> Frames: <ntoskrnl.exe:899b0 (ntoskrnl/ke/bug.c:1136 (KeBugCheckWithTf))> <ntoskrnl.exe:134826 (ntoskrnl/ke/i386/exp.c:1161 (KeRaiseUserException))> <ntoskrnl.exe:19ae67 (ntoskrnl/ke/i386/traphdlr.c:1282 (KiTrap0DHandler))> <ntoskrnl.exe:19a840 (:0 (KiTrap0D))> <ntoskrnl.exe:1925e6 (ntoskrnl/include/internal/i386/intrin_i.h:45 (KiInitMachineDependent))> <ntoskrnl.exe:187688 (ntoskrnl/ke/krnlinit.c:305 (KeInitSystem))> <ntoskrnl.exe:17fb2f (ntoskrnl/ex/init.c:1621 (Phase1InitializationDiscard))> <ntoskrnl.exe:3247f (ntoskrnl/ex/init.c:2019 (Phase1Initialization))> <ntoskrnl.exe:11c079 (ntoskrnl/ps/thread.c:156 (PspSystemThreadStartup))> <ntoskrnl.exe:135c8a (ntoskrnl/ke/i386/thrdini.c:78 (KiThreadStartup))> <ntoskrnl.exe:11c040 (ntoskrnl/ps/thread.c:141 (PspSystemThreadStartup))> <5d8950ec> Couldn't access memory at 0x83E58959! </snip> - Double-fault (manually triggered by removing the GP handler): Note how the backtrace explicitly specifies the crossed TSS boundaries, and the trace in the parent TSS is indeed consistent with the previous example. Note also that log2lines (used here to completely resolve the trace) failed to see KiTrap08Handler(), which has been instead mistaken for KiTrap09(). <snip> *** Fatal System Error: 0x0000007f (0x00000008,0x8009C000,0x00000000,0x00000000) Entered debugger on embedded INT3 at 0x0008:0x80953528. kdb:> bt [Active TSS 0x0050 @ 0x80A10CA0] Eip: <ntoskrnl.exe:153529 (sdk/lib/rtl/i386/debug_asm.S:57 (RtlpBreakWithStatusInstruction))> Frames: <ntoskrnl.exe:899b0 (ntoskrnl/ke/bug.c:1136 (KeBugCheckWithTf))> <ntoskrnl.exe:19a1d8 (ntoskrnl/ke/i386/traphdlr.c:917 (KiTrap09))> // <-- Here, log2lines fails to see it's actually KiTrap08Handler. <ntoskrnl.exe:19a145 (:0 (KiTrap08))> [Parent TSS 0x0028 @ 0x8009C000] <ntoskrnl.exe:1925e6 (ntoskrnl/include/internal/i386/intrin_i.h:45 (KiInitMachineDependent))> <ntoskrnl.exe:187688 (ntoskrnl/ke/krnlinit.c:305 (KeInitSystem))> <ntoskrnl.exe:17fb2f (ntoskrnl/ex/init.c:1621 (Phase1InitializationDiscard))> <ntoskrnl.exe:3247f (ntoskrnl/ex/init.c:2019 (Phase1Initialization))> <ntoskrnl.exe:11c079 (ntoskrnl/ps/thread.c:156 (PspSystemThreadStartup))> <ntoskrnl.exe:135c8a (ntoskrnl/ke/i386/thrdini.c:78 (KiThreadStartup))> <ntoskrnl.exe:11c040 (ntoskrnl/ps/thread.c:141 (PspSystemThreadStartup))> <5d8950ec> Couldn't access memory at 0x83E58959! </snip> --- ntoskrnl/kdbg/kdb_cli.c | 186 ++++++++++++++++++++++++++---------------------- 1 file changed, 102 insertions(+), 84 deletions(-) diff --git a/ntoskrnl/kdbg/kdb_cli.c b/ntoskrnl/kdbg/kdb_cli.c index fd93246afa7..abf2e6d84aa 100644 --- a/ntoskrnl/kdbg/kdb_cli.c +++ b/ntoskrnl/kdbg/kdb_cli.c @@ -1033,86 +1033,73 @@ KdbpRetrieveTss( return Tss; } -static BOOLEAN -KdbpTrapFrameFromPrevTss( - PKTRAP_FRAME TrapFrame) +FORCEINLINE BOOLEAN +KdbpIsNestedTss( + IN USHORT TssSelector, + IN PKTSS Tss) { - ULONG_PTR Eip, Ebp; - KDESCRIPTOR Gdtr; - KGDTENTRY Desc; - USHORT Sel; - PKTSS Tss; - - Ke386GetGlobalDescriptorTable(&Gdtr.Limit); - Sel = Ke386GetTr(); + USHORT Backlink; - if ((Sel & (sizeof(KGDTENTRY) - 1)) || - (Sel < sizeof(KGDTENTRY)) || - (Sel + sizeof(KGDTENTRY) - 1 > Gdtr.Limit)) + if (!Tss) return FALSE; - if (!NT_SUCCESS(KdbpSafeReadMemory(&Desc, - (PVOID)(Gdtr.Base + Sel), - sizeof(KGDTENTRY)))) + /* Retrieve the TSS Backlink */ + if (!NT_SUCCESS(KdbpSafeReadMemory(&Backlink, + (PVOID)&Tss->Backlink, + sizeof(USHORT)))) + { return FALSE; + } - if (Desc.HighWord.Bits.Type != 0xB) - return FALSE; + return (Backlink != 0 && Backlink != TssSelector); +} - Tss = (PKTSS)(ULONG_PTR)(Desc.BaseLow | - Desc.HighWord.Bytes.BaseMid << 16 | - Desc.HighWord.Bytes.BaseHi << 24); +static BOOLEAN +KdbpTrapFrameFromPrevTss( + IN OUT PKTRAP_FRAME TrapFrame, + OUT PUSHORT TssSelector, + IN OUT PKTSS* pTss, + IN PKDESCRIPTOR pGdtr) +{ + ULONG_PTR Eip, Ebp; + USHORT Backlink; + PKTSS Tss = *pTss; - if (!NT_SUCCESS(KdbpSafeReadMemory(&Sel, + /* Retrieve the TSS Backlink */ + if (!NT_SUCCESS(KdbpSafeReadMemory(&Backlink, (PVOID)&Tss->Backlink, sizeof(USHORT)))) + { return FALSE; + } - if ((Sel & (sizeof(KGDTENTRY) - 1)) || - (Sel < sizeof(KGDTENTRY)) || - (Sel + sizeof(KGDTENTRY) - 1 > Gdtr.Limit)) - return FALSE; - - if (!NT_SUCCESS(KdbpSafeReadMemory(&Desc, - (PVOID)(Gdtr.Base + Sel), - sizeof(KGDTENTRY)))) - return FALSE; - - if (Desc.HighWord.Bits.Type != 0xB) + /* Retrieve the parent TSS */ + Tss = KdbpRetrieveTss(Backlink, NULL, pGdtr); + if (!Tss) return FALSE; - Tss = (PKTSS)(ULONG_PTR)(Desc.BaseLow | - Desc.HighWord.Bytes.BaseMid << 16 | - Desc.HighWord.Bytes.BaseHi << 24); - if (!NT_SUCCESS(KdbpSafeReadMemory(&Eip, (PVOID)&Tss->Eip, sizeof(ULONG_PTR)))) + { return FALSE; + } if (!NT_SUCCESS(KdbpSafeReadMemory(&Ebp, (PVOID)&Tss->Ebp, sizeof(ULONG_PTR)))) + { return FALSE; + } + /* Return the parent TSS and its trap frame */ + *TssSelector = Backlink; + *pTss = Tss; TrapFrame->Eip = Eip; TrapFrame->Ebp = Ebp; return TRUE; } -VOID __cdecl KiTrap02(VOID); -VOID FASTCALL KiTrap03Handler(IN PKTRAP_FRAME); -VOID __cdecl KiTrap08(VOID); -VOID __cdecl KiTrap09(VOID); - -static BOOLEAN -KdbpInNmiOrDoubleFaultHandler( - ULONG_PTR Address) -{ - return (Address > (ULONG_PTR)KiTrap02 && Address < (ULONG_PTR)KiTrap03Handler) || - (Address > (ULONG_PTR)KiTrap08 && Address < (ULONG_PTR)KiTrap09); -} - /*!\brief Displays a backtrace. */ static BOOLEAN @@ -1122,15 +1109,17 @@ KdbpCmdBackTrace( { ULONG ul; ULONGLONG Result = 0; - ULONG_PTR Frame = KdbCurrentTrapFrame->Tf.Ebp; + KTRAP_FRAME TrapFrame = KdbCurrentTrapFrame->Tf; + ULONG_PTR Frame = TrapFrame.Ebp; ULONG_PTR Address; - KTRAP_FRAME TrapFrame; + KDESCRIPTOR Gdtr; + USHORT TssSelector; + PKTSS Tss; if (Argc >= 2) { /* Check for [L count] part */ ul = 0; - if (strcmp(Argv[Argc-2], "L") == 0) { ul = strtoul(Argv[Argc-1], NULL, 0); @@ -1157,7 +1146,7 @@ KdbpCmdBackTrace( Argc++; } - /* Check if frame addr or thread id is given. */ + /* Check if a Frame Address or Thread ID is given */ if (Argc > 1) { if (Argv[1][0] == '*') @@ -1169,7 +1158,7 @@ KdbpCmdBackTrace( return TRUE; if (Result > (ULONGLONG)(~((ULONG_PTR)0))) - KdbpPrint("Warning: Address %I64x is beeing truncated\n",Result); + KdbpPrint("Warning: Address %I64x is beeing truncated\n", Result); Frame = (ULONG_PTR)Result; } @@ -1179,66 +1168,95 @@ KdbpCmdBackTrace( return TRUE; } } - else + + /* Retrieve the Global Descriptor Table */ + Ke386GetGlobalDescriptorTable(&Gdtr.Limit); + + /* Retrieve the current (active) TSS */ + TssSelector = Ke386GetTr(); + Tss = KdbpRetrieveTss(TssSelector, NULL, &Gdtr); + if (KdbpIsNestedTss(TssSelector, Tss)) { - KdbpPrint("Eip:\n"); + /* Display the active TSS if it is nested */ + KdbpPrint("[Active TSS 0x%04x @ 0x%p]\n", TssSelector, Tss); + } - /* Try printing the function at EIP */ - if (!KdbSymPrintAddress((PVOID)KdbCurrentTrapFrame->Tf.Eip, &KdbCurrentTrapFrame->Tf)) - KdbpPrint("<%08x>\n", KdbCurrentTrapFrame->Tf.Eip); + /* If no Frame Address or Thread ID was given, try printing the function at EIP */ + if (Argc <= 1) + { + KdbpPrint("Eip:\n"); + if (!KdbSymPrintAddress((PVOID)TrapFrame.Eip, &TrapFrame)) + KdbpPrint("<%08x>\n", TrapFrame.Eip); else KdbpPrint("\n"); } - TrapFrame = KdbCurrentTrapFrame->Tf; + /* Walk through the frames */ KdbpPrint("Frames:\n"); - for (;;) { BOOLEAN GotNextFrame; if (Frame == 0) - break; + goto CheckForParentTSS; - if (!NT_SUCCESS(KdbpSafeReadMemory(&Address, (PVOID)(Frame + sizeof(ULONG_PTR)), sizeof (ULONG_PTR)))) + Address = 0; + if (!NT_SUCCESS(KdbpSafeReadMemory(&Address, (PVOID)(Frame + sizeof(ULONG_PTR)), sizeof(ULONG_PTR)))) { KdbpPrint("Couldn't access memory at 0x%p!\n", Frame + sizeof(ULONG_PTR)); - break; + goto CheckForParentTSS; } - if ((GotNextFrame = NT_SUCCESS(KdbpSafeReadMemory(&Frame, (PVOID)Frame, sizeof (ULONG_PTR))))) + if (Address == 0) + goto CheckForParentTSS; + + GotNextFrame = NT_SUCCESS(KdbpSafeReadMemory(&Frame, (PVOID)Frame, sizeof(ULONG_PTR))); + if (GotNextFrame) TrapFrame.Ebp = Frame; + // else + // Frame = 0; - /* Print the location of the call instruction */ + /* Print the location of the call instruction (assumed 5 bytes length) */ if (!KdbSymPrintAddress((PVOID)(Address - 5), &TrapFrame)) KdbpPrint("<%08x>\n", Address); else KdbpPrint("\n"); - if (KdbOutputAborted) break; - - if (Address == 0) + if (KdbOutputAborted) break; - if (KdbpInNmiOrDoubleFaultHandler(Address)) + if (!GotNextFrame) { - if ((GotNextFrame = KdbpTrapFrameFromPrevTss(&TrapFrame))) - { - Address = TrapFrame.Eip; - Frame = TrapFrame.Ebp; - - if (!KdbSymPrintAddress((PVOID)Address, &TrapFrame)) - KdbpPrint("<%08x>\n", Address); - else - KdbpPrint("\n"); - } + KdbpPrint("Couldn't access memory at 0x%p!\n", Frame); + goto CheckForParentTSS; // break; } + continue; + +CheckForParentTSS: + /* + * We have ended the stack walking for the current (active) TSS. + * Check whether this TSS was nested, and if so switch to its parent + * and walk its stack. + */ + if (!KdbpIsNestedTss(TssSelector, Tss)) + break; // The TSS is not nested, we stop there. + + GotNextFrame = KdbpTrapFrameFromPrevTss(&TrapFrame, &TssSelector, &Tss, &Gdtr); if (!GotNextFrame) { - KdbpPrint("Couldn't access memory at 0x%p!\n", Frame); - break; + KdbpPrint("Couldn't access parent TSS 0x%04x\n", Tss->Backlink); + break; // Cannot retrieve the parent TSS, we stop there. } + Address = TrapFrame.Eip; + Frame = TrapFrame.Ebp; + + KdbpPrint("[Parent TSS 0x%04x @ 0x%p]\n", TssSelector, Tss); + + if (!KdbSymPrintAddress((PVOID)Address, &TrapFrame)) + KdbpPrint("<%08x>\n", Address); + else + KdbpPrint("\n"); } return TRUE;

1 0

[reactos] 01/01: [COMCTL32] Beautification addendum CORE-16466
by Joachim Henze 13 Nov '19

13 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9e4d810569becc76ddef… commit f9e4d810569becc76ddefbcda22864e3cbc861c6 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Nov 13 01:22:00 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Nov 13 01:22:00 2019 +0100 [COMCTL32] Beautification addendum CORE-16466 I overlooked those missing white-spaces in 0.4.14-dev-312-g b931f643e35e6a23dbef99e785804039ea579b6a No functional change. --- dll/win32/comctl32/listview.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index 79012f8a1f1..7aa9c4c611c 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -2127,12 +2127,12 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr) { vertInfo.nMax = infoPtr->nItemCount; - /* scroll by at least one page */ - if (vertInfo.nPage < infoPtr->nItemHeight) - vertInfo.nPage = infoPtr->nItemHeight; + /* scroll by at least one page */ + if (vertInfo.nPage < infoPtr->nItemHeight) + vertInfo.nPage = infoPtr->nItemHeight; - if (infoPtr->nItemHeight > 0) - vertInfo.nPage /= infoPtr->nItemHeight; + if (infoPtr->nItemHeight > 0) + vertInfo.nPage /= infoPtr->nItemHeight; } #else vertInfo.nMax = infoPtr->nItemCount;

1 0

[reactos] 01/01: [COMCTL32] Fix listview scrollbars flashing CORE-16466
by Joachim Henze 12 Nov '19

12 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b931f643e35e6a23dbef9… commit b931f643e35e6a23dbef99e785804039ea579b6a Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Wed Nov 13 00:30:00 2019 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Wed Nov 13 00:30:00 2019 +0100 [COMCTL32] Fix listview scrollbars flashing CORE-16466 Many Thanks to patches author JIRA user 'I_Kill_Bugs', but also to Doug Lyons and Fabian Maurer. Unhidden by SVN r75735 == git 0.4.7-dev-168-g 6af37fd54e53658bb4d832d01e4ee2546af98835 I will merge that back into 0.4.13-RC as well. --- dll/win32/comctl32/listview.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dll/win32/comctl32/listview.c b/dll/win32/comctl32/listview.c index 764a127f78b..79012f8a1f1 100644 --- a/dll/win32/comctl32/listview.c +++ b/dll/win32/comctl32/listview.c @@ -2088,6 +2088,9 @@ static INT LISTVIEW_UpdateHScroll(LISTVIEW_INFO *infoPtr) horzInfo.fMask = SIF_RANGE | SIF_PAGE; horzInfo.nMax = max(horzInfo.nMax - 1, 0); +#ifdef __REACTOS__ /* CORE-16466 part 1 of 4 */ + horzInfo.nMax = (horzInfo.nPage == 0 ? 0 : horzInfo.nMax); +#endif dx = GetScrollPos(infoPtr->hwndSelf, SB_HORZ); dx -= SetScrollInfo(infoPtr->hwndSelf, SB_HORZ, &horzInfo, TRUE); TRACE("horzInfo=%s\n", debugscrollinfo(&horzInfo)); @@ -2111,10 +2114,27 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr) ZeroMemory(&vertInfo, sizeof(SCROLLINFO)); vertInfo.cbSize = sizeof(SCROLLINFO); +#ifdef __REACTOS__ /* CORE-16466 part 2 of 4 */ + vertInfo.nPage = max((infoPtr->rcList.bottom - infoPtr->rcList.top), 0); +#else vertInfo.nPage = infoPtr->rcList.bottom - infoPtr->rcList.top; +#endif if (infoPtr->uView == LV_VIEW_DETAILS) { +#ifdef __REACTOS__ /* CORE-16466 part 3 of 4 */ + if (vertInfo.nPage != 0) + { + vertInfo.nMax = infoPtr->nItemCount; + + /* scroll by at least one page */ + if (vertInfo.nPage < infoPtr->nItemHeight) + vertInfo.nPage = infoPtr->nItemHeight; + + if (infoPtr->nItemHeight > 0) + vertInfo.nPage /= infoPtr->nItemHeight; + } +#else vertInfo.nMax = infoPtr->nItemCount; /* scroll by at least one page */ @@ -2123,6 +2143,7 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr) if (infoPtr->nItemHeight > 0) vertInfo.nPage /= infoPtr->nItemHeight; +#endif } else if (infoPtr->uView != LV_VIEW_LIST) /* LV_VIEW_ICON, or LV_VIEW_SMALLICON */ { @@ -2133,6 +2154,9 @@ static INT LISTVIEW_UpdateVScroll(LISTVIEW_INFO *infoPtr) vertInfo.fMask = SIF_RANGE | SIF_PAGE; vertInfo.nMax = max(vertInfo.nMax - 1, 0); +#ifdef __REACTOS__ /* CORE-16466 part 4 of 4 */ + vertInfo.nMax = (vertInfo.nPage == 0 ? 0 : vertInfo.nMax); +#endif dy = GetScrollPos(infoPtr->hwndSelf, SB_VERT); dy -= SetScrollInfo(infoPtr->hwndSelf, SB_VERT, &vertInfo, TRUE); TRACE("vertInfo=%s\n", debugscrollinfo(&vertInfo));

1 0

[reactos] 01/01: [BTRFS] Fix MSVC build
by Pierre Schweitzer 12 Nov '19

12 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=cc5c307b8ed889289febb… commit cc5c307b8ed889289febb8d190b003005259b4f5 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Wed Nov 13 00:03:22 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Wed Nov 13 00:03:22 2019 +0100 [BTRFS] Fix MSVC build --- drivers/filesystems/btrfs/btrfs_drv.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/filesystems/btrfs/btrfs_drv.h b/drivers/filesystems/btrfs/btrfs_drv.h index e24e4980244..24307d93810 100644 --- a/drivers/filesystems/btrfs/btrfs_drv.h +++ b/drivers/filesystems/btrfs/btrfs_drv.h @@ -1588,6 +1588,7 @@ void __stdcall check_system_root(PDRIVER_OBJECT DriverObject, PVOID Context, ULO // based on function in sys/sysmacros.h #define makedev(major, minor) (((minor) & 0xFF) | (((major) & 0xFFF) << 8) | (((uint64_t)((minor) & ~0xFF)) << 12) | (((uint64_t)((major) & ~0xFFF)) << 32)) +#ifndef __REACTOS__ // not in mingw yet #ifndef _MSC_VER typedef struct { @@ -1608,6 +1609,22 @@ typedef struct { #else #define FSRTL_ADVANCED_FCB_HEADER_NEW FSRTL_ADVANCED_FCB_HEADER #endif +#else +typedef struct { + FSRTL_COMMON_FCB_HEADER DUMMYSTRUCTNAME; + PFAST_MUTEX FastMutex; + LIST_ENTRY FilterContexts; + EX_PUSH_LOCK PushLock; + PVOID* FileContextSupportPointer; + union { + OPLOCK Oplock; + PVOID ReservedForRemote; + }; + PVOID ReservedContext; +} FSRTL_ADVANCED_FCB_HEADER_NEW; + +#define FSRTL_FCB_HEADER_V2 2 +#endif static __inline POPLOCK fcb_oplock(fcb* fcb) { if (fcb->Header.Version >= FSRTL_FCB_HEADER_V2)

1 0

[reactos] 01/01: [SHELLBTRFS] Addendum to 1725ddf
by Pierre Schweitzer 12 Nov '19

12 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45a643a136eedf8b39d22… commit 45a643a136eedf8b39d22f5add94fd372320fdee Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 12 23:46:53 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Nov 12 23:46:53 2019 +0100 [SHELLBTRFS] Addendum to 1725ddf --- dll/shellext/shellbtrfs/contextmenu.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dll/shellext/shellbtrfs/contextmenu.cpp b/dll/shellext/shellbtrfs/contextmenu.cpp index 3fbca1cb7c2..bf4b5e92c09 100755 --- a/dll/shellext/shellbtrfs/contextmenu.cpp +++ b/dll/shellext/shellbtrfs/contextmenu.cpp @@ -833,15 +833,25 @@ void BtrfsContextMenu::reflink_copy(HWND hwnd, const WCHAR* fn, const WCHAR* dir streambufsize += 0x1000; streambuf.resize(streambufsize); +#ifndef __REACTOS__ memset(streambuf.data(), 0, streambufsize); Status = NtQueryInformationFile(source, &iosb, streambuf.data(), streambufsize, FileStreamInformation); +#else + memset(&streambuf[0], 0, streambufsize); + + Status = NtQueryInformationFile(source, &iosb, &streambuf[0], streambufsize, FileStreamInformation); +#endif } while (Status == STATUS_BUFFER_OVERFLOW); if (!NT_SUCCESS(Status)) throw ntstatus_error(Status); +#ifndef __REACTOS__ auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(streambuf.data()); +#else + auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(&streambuf[0]); +#endif while (true) { if (fsi->StreamNameLength > 0) { @@ -1525,15 +1535,25 @@ static void reflink_copy2(const wstring& srcfn, const wstring& destdir, const ws streambufsize += 0x1000; streambuf.resize(streambufsize); +#ifndef __REACTOS__ memset(streambuf.data(), 0, streambufsize); Status = NtQueryInformationFile(source, &iosb, streambuf.data(), streambufsize, FileStreamInformation); +#else + memset(&streambuf[0], 0, streambufsize); + + Status = NtQueryInformationFile(source, &iosb, &streambuf[0], streambufsize, FileStreamInformation); +#endif } while (Status == STATUS_BUFFER_OVERFLOW); if (!NT_SUCCESS(Status)) throw ntstatus_error(Status); +#ifndef __REACTOS__ auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(streambuf.data()); +#else + auto fsi = reinterpret_cast<FILE_STREAM_INFORMATION*>(&streambuf[0]); +#endif while (true) { if (fsi->StreamNameLength > 0) {

1 0

[reactos] 01/01: [SHELLBTRFS] Replace emplace_back by something less efficient if not avaible
by Pierre Schweitzer 12 Nov '19

12 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5f779048d30bb7fc44e85… commit 5f779048d30bb7fc44e855289c3680706687ad66 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 12 23:29:08 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Nov 12 23:29:08 2019 +0100 [SHELLBTRFS] Replace emplace_back by something less efficient if not avaible --- dll/shellext/shellbtrfs/mountmgr_local.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dll/shellext/shellbtrfs/mountmgr_local.cpp b/dll/shellext/shellbtrfs/mountmgr_local.cpp index 061962369ff..45a47e68e15 100644 --- a/dll/shellext/shellbtrfs/mountmgr_local.cpp +++ b/dll/shellext/shellbtrfs/mountmgr_local.cpp @@ -217,7 +217,11 @@ vector<mountmgr_point> mountmgr::query_points(const wstring_view& symlink, const if (mmps->MountPoints[i].DeviceNameLength) mpdn = wstring_view((WCHAR*)((uint8_t*)mmps + mmps->MountPoints[i].DeviceNameOffset), mmps->MountPoints[i].DeviceNameLength / sizeof(WCHAR)); +#ifndef __REACTOS__ v.emplace_back(mpsl, mpuid, mpdn); +#else + v.push_back(mountmgr_point(mpsl, mpuid, mpdn)); +#endif } return v;

1 0

[reactos] 01/01: [SHELLBTRFS] Addendum to 1725ddf
by Pierre Schweitzer 12 Nov '19

12 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a3c13c624f4a115f99560… commit a3c13c624f4a115f99560990f065dd94e4526304 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 12 23:12:48 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Nov 12 23:12:48 2019 +0100 [SHELLBTRFS] Addendum to 1725ddf --- dll/shellext/shellbtrfs/mountmgr_local.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dll/shellext/shellbtrfs/mountmgr_local.cpp b/dll/shellext/shellbtrfs/mountmgr_local.cpp index ee7901e1f2a..061962369ff 100644 --- a/dll/shellext/shellbtrfs/mountmgr_local.cpp +++ b/dll/shellext/shellbtrfs/mountmgr_local.cpp @@ -48,7 +48,11 @@ void mountmgr::create_point(const wstring_view& symlink, const wstring_view& dev memcpy((uint8_t*)mcpi + mcpi->DeviceNameOffset, device.data(), device.length() * sizeof(WCHAR)); Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_CREATE_POINT, +#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), nullptr, 0); +#else + &buf[0], (ULONG)buf.size(), nullptr, 0); +#endif if (!NT_SUCCESS(Status)) throw ntstatus_error(Status); @@ -103,13 +107,21 @@ void mountmgr::delete_points(const wstring_view& symlink, const wstring_view& un #endif Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_DELETE_POINTS, +#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); +#else + &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); +#endif if (Status == STATUS_BUFFER_OVERFLOW) { buf2.resize(mmps->Size); Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_DELETE_POINTS, +#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); +#else + &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); +#endif } if (!NT_SUCCESS(Status)) @@ -166,7 +178,11 @@ vector<mountmgr_point> mountmgr::query_points(const wstring_view& symlink, const #endif Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_QUERY_POINTS, +#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); +#else + &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); +#endif if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_OVERFLOW) throw ntstatus_error(Status); @@ -179,7 +195,11 @@ vector<mountmgr_point> mountmgr::query_points(const wstring_view& symlink, const #endif Status = NtDeviceIoControlFile(h, nullptr, nullptr, nullptr, &iosb, IOCTL_MOUNTMGR_QUERY_POINTS, +#ifndef __REACTOS__ buf.data(), (ULONG)buf.size(), buf2.data(), (ULONG)buf2.size()); +#else + &buf[0], (ULONG)buf.size(), &buf2[0], (ULONG)buf2.size()); +#endif if (!NT_SUCCESS(Status)) throw ntstatus_error(Status);

1 0

[reactos] 01/01: [SHELLBTRFS] Fix build? (Not sure why it works locally...)
by Pierre Schweitzer 12 Nov '19

12 Nov '19

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a837184300041ea328a18… commit a837184300041ea328a187f44488f45252aa49f6 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Tue Nov 12 21:52:16 2019 +0100 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Tue Nov 12 21:52:16 2019 +0100 [SHELLBTRFS] Fix build? (Not sure why it works locally...) --- dll/shellext/shellbtrfs/shellext.h | 1 + 1 file changed, 1 insertion(+) diff --git a/dll/shellext/shellbtrfs/shellext.h b/dll/shellext/shellbtrfs/shellext.h index af7776cb5a3..cfa09779213 100755 --- a/dll/shellext/shellbtrfs/shellext.h +++ b/dll/shellext/shellbtrfs/shellext.h @@ -42,6 +42,7 @@ #include <strsafe.h> #include <ndk/iofuncs.h> #include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #endif #include <string> #ifdef __REACTOS__

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