shell32: Avoid using CopyRect().

Signed-off-by: Michael Stefaniuc <mstefani@redhat.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shell32: Avoid using CopyRect().
ee3deec6 · Michael Stefaniuc · Alexandre Julliard · ce888709 · ee3deec6 · ee3deec6
Commit ee3deec6 authored Jun 22, 2016 by Michael Stefaniuc Committed by Alexandre Julliard Jun 22, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

ebrowser.c dlls/shell32/ebrowser.c +3 -4

shlmenu.c dlls/shell32/shlmenu.c +1 -1

No files found.
--- a/dlls/shell32/ebrowser.c
+++ b/dlls/shell32/ebrowser.c
@@ -498,7 +498,7 @@ static LRESULT navpane_splitter_beginresize(ExplorerBrowserImpl *This, HWND hwnd

    SetCapture(hwnd);

-    CopyRect(&This->splitter_rc, &This->navpane.rc);
+    This->splitter_rc = This->navpane.rc;
    This->splitter_rc.left = This->splitter_rc.right - SPLITTER_WIDTH;

    splitter_draw(GetParent(hwnd), &This->splitter_rc);
@@ -516,8 +516,7 @@ static LRESULT navpane_splitter_resizing(ExplorerBrowserImpl *This, HWND hwnd, L
    dx = (SHORT)LOWORD(lParam);
    TRACE("%d.\n", dx);

-    CopyRect(&rc, &This->navpane.rc);
-
+    rc = This->navpane.rc;
    new_width = This->navpane.width + dx;
    if(new_width > NP_MIN_WIDTH && This->sv_rc.right - new_width > SV_MIN_WIDTH)
    {
@@ -525,7 +524,7 @@ static LRESULT navpane_splitter_resizing(ExplorerBrowserImpl *This, HWND hwnd, L
        rc.left = rc.right - SPLITTER_WIDTH;
        splitter_draw(GetParent(hwnd), &This->splitter_rc);
        splitter_draw(GetParent(hwnd), &rc);
-        CopyRect(&This->splitter_rc, &rc);
+        This->splitter_rc = rc;
    }

    return TRUE;

--- a/dlls/shell32/shlmenu.c
+++ b/dlls/shell32/shlmenu.c
@@ -613,7 +613,7 @@ LRESULT WINAPI FileMenu_DrawItem(
 	  clrPrevBkgnd = SetBkColor(lpdis->hDC, GetSysColor (COLOR_MENU));
 	}

-	CopyRect(&TextRect, &(lpdis->rcItem));
+        TextRect = lpdis->rcItem;

 	/* add the menubitmap */
 	menuinfo = FM_GetMenuInfo(pMyItem->hMenu);