[hbelusca] 72117: [COMCTL32]: Addendum to r72116: Add the __REACTOS__ ifdefs to ease wine syncing, and update the patch in accordance. CORE-11532

Author: hbelusca
Date: Fri Aug  5 17:45:34 2016
New Revision: 72117

URL: http://svn.reactos.org/svn/reactos?rev=72117&view=rev
Log:
[COMCTL32]: Addendum to r72116: Add the __REACTOS__ ifdefs to ease wine syncing, and
update the patch in accordance.
CORE-11532

Modified:
    trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
    trunk/reactos/dll/win32/comctl32/rebar.c

Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3…
==============================================================================
--- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff	[iso-8859-1] Fri Aug  5 17:45:34
2016
@@ -848,6 +848,28 @@
      }
      TRACE("new client=(%s)\n", wine_dbgstr_rect(rect));
      return 0;
+@@ -3302,7 +3365,11 @@ REBAR_NCHitTest (const REBAR_INFO *infoP
+ 			   (INT *)&nmmouse.dwItemSpec);
+     nmmouse.dwItemData = 0;
+     nmmouse.pt = clpt;
++#ifdef __REACTOS__
++    nmmouse.dwHitInfo = scrap;
++#else
+     nmmouse.dwHitInfo = 0;
++#endif
+     if ((i = REBAR_Notify((NMHDR *) &nmmouse, infoPtr, NM_NCHITTEST))) {
+ 	TRACE("notify changed return value from %ld to %d\n",
+ 	      ret, i);
+@@ -3374,6 +3441,9 @@ REBAR_Paint (const REBAR_INFO *infoPtr,
+ {
+     if (hdc) {
+         TRACE("painting\n");
++#ifdef __REACTOS__
++        REBAR_EraseBkGnd (infoPtr, hdc);
++#endif
+         REBAR_Refresh (infoPtr, hdc);
+     } else {
+         PAINTSTRUCT ps;
 @@ -3652,7 +3728,11 @@ REBAR_WindowProc (HWND hwnd, UINT uMsg, 
  	    return REBAR_ShowBand (infoPtr, wParam, lParam);
  

Modified: trunk/reactos/dll/win32/comctl32/rebar.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/rebar.c…
==============================================================================
--- trunk/reactos/dll/win32/comctl32/rebar.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comctl32/rebar.c	[iso-8859-1] Fri Aug  5 17:45:34 2016
@@ -3378,7 +3378,11 @@
 			   (INT *)&nmmouse.dwItemSpec);
     nmmouse.dwItemData = 0;
     nmmouse.pt = clpt;
+#ifdef __REACTOS__
     nmmouse.dwHitInfo = scrap;
+#else
+    nmmouse.dwHitInfo = 0;
+#endif
     if ((i = REBAR_Notify((NMHDR *) &nmmouse, infoPtr, NM_NCHITTEST))) {
 	TRACE("notify changed return value from %ld to %d\n",
 	      ret, i);
@@ -3450,7 +3454,9 @@
 {
     if (hdc) {
         TRACE("painting\n");
+#ifdef __REACTOS__
         REBAR_EraseBkGnd (infoPtr, hdc);
+#endif
         REBAR_Refresh (infoPtr, hdc);
     } else {
         PAINTSTRUCT ps;