Michael Stefaniuc : shell32: Avoid using CopyRect().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ee3deec635b03f0508f3d087ab1999b889c2205b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=ee3deec635b03f0508f3d087ab1999b889c2205b

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Wed Jun 22 11:54:09 2016 +0200

shell32: Avoid using CopyRect().

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

---

 dlls/shell32/ebrowser.c | 7 +++----
 dlls/shell32/shlmenu.c  | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/shell32/ebrowser.c b/dlls/shell32/ebrowser.c
index 0cee30f..bbccf88 100644
--- 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;
diff --git a/dlls/shell32/shlmenu.c b/dlls/shell32/shlmenu.c
index 694b5d1..7a960ad 100644
--- 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);