[ros-diffs] [reactos] 01/01: [NTUSER] Missing "X" on "Folder" pane when Right Click > Explore from Desktop icons & Rapps toolbar errors (#5068)

[Doug Lyons]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=57eb2a6bf469383848a55…

commit 57eb2a6bf469383848a559feedc1eed7fc13dd5c
Author:     Doug Lyons <douglyons(a)douglyons.com>
AuthorDate: Mon Feb 13 08:27:40 2023 -0600
Commit:     GitHub <noreply(a)github.com>
CommitDate: Mon Feb 13 15:27:40 2023 +0100

    [NTUSER] Missing "X" on "Folder" pane when Right Click >
Explore from Desktop icons & Rapps toolbar errors (#5068)
    
    Fix for right-clicking on 'My Computer' and selecting 'explore' and
there is no 'X' for the title bar in the Folders pane
    Also fixes Rapps missing toolbar combo box and edit box controls that were not
displayed.
    
    This is a complete revert of #4995 (commit 7866eb2) while still retaining its fixes.
    
    CORE-18830, CORE-18817
    
    Co-authored-by: I_Kill_Bugs
---
 win32ss/user/ntuser/winpos.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c
index c0251ccc6a5..f95da850077 100644
--- a/win32ss/user/ntuser/winpos.c
+++ b/win32ss/user/ntuser/winpos.c
@@ -1979,7 +1979,7 @@ co_WinPosSetWindowPos(
       Window->state |= WNDS_SENDNCPAINT;
    }
 
-   if (!(WinPos.flags & SWP_NOREDRAW))
+   if (!(WinPos.flags & SWP_NOREDRAW) && ((WinPos.flags &
SWP_AGG_STATUSFLAGS) != SWP_AGG_NOPOSCHANGE))
    {
       /* Determine the new visible region */
       VisAfter = VIS_ComputeVisibleRegion(Window, FALSE, FALSE,
@@ -2100,8 +2100,7 @@ co_WinPosSetWindowPos(
       }
 
       /* We need to redraw what wasn't visible before or force a redraw */
-      if ((WinPos.flags & (SWP_FRAMECHANGED | SWP_SHOWWINDOW)) ||
-          (((WinPos.flags & SWP_AGG_NOGEOMETRYCHANGE) != SWP_AGG_NOGEOMETRYCHANGE)
&& VisAfter != NULL))
+      if (VisAfter != NULL)
       {
          PREGION DirtyRgn = IntSysCreateRectpRgn(0, 0, 0, 0);
          if (DirtyRgn)