[ros-diffs] [akhaldi] 72568: [SHELL32] Partially sync shlmenu.c with Wine Staging 1.9.16. CORE-11866

Author: akhaldi
Date: Sun Sep  4 08:57:08 2016
New Revision: 72568

URL: http://svn.reactos.org/svn/reactos?rev=72568&view=rev
Log:
[SHELL32] Partially sync shlmenu.c with Wine Staging 1.9.16. CORE-11866

Modified:
    trunk/reactos/dll/win32/shell32/wine/shlmenu.c

Modified: trunk/reactos/dll/win32/shell32/wine/shlmenu.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/shl…
==============================================================================
--- trunk/reactos/dll/win32/shell32/wine/shlmenu.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/wine/shlmenu.c	[iso-8859-1] Sun Sep  4 08:57:08 2016
@@ -608,7 +608,7 @@
 	  clrPrevBkgnd = SetBkColor(lpdis->hDC, GetSysColor (COLOR_MENU));
 	}
 
-	CopyRect(&TextRect, &(lpdis->rcItem));
+        TextRect = lpdis->rcItem;
 
 	/* add the menubitmap */
 	menuinfo = FM_GetMenuInfo(pMyItem->hMenu);
@@ -628,7 +628,7 @@
 	Shell_GetImageLists(0, &hImageList);
 	ImageList_Draw(hImageList, pMyItem->iIconIndex, lpdis->hDC, xi, yi, ILD_NORMAL);
 
-	TRACE("-- 0x%04x 0x%04x 0x%04x 0x%04x\n", TextRect.left, TextRect.top,
TextRect.right, TextRect.bottom);
+        TRACE("-- %s\n", wine_dbgstr_rect(&TextRect));
 
 	SetTextColor(lpdis->hDC, clrPrevText);
 	SetBkColor(lpdis->hDC, clrPrevBkgnd);
@@ -789,8 +789,8 @@
 	FIXME("%p 0x%08x\n", hMenu, uPos);
 
 	if (GetMenuItemRect(0, hMenu, uPos, &rect))
-	{ FIXME("0x%04x 0x%04x 0x%04x 0x%04x\n",
-	  rect.right, rect.left, rect.top, rect.bottom);
+        {
+          FIXME("%s\n", wine_dbgstr_rect(&rect));
 	  return ((rect.right-rect.left)<<16) + (rect.top-rect.bottom);
 	}
 	return 0x00100010; /*FIXME*/