From b515da6e1e0af0db81b69678eab08dbd114145d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?=
 <hermes.belusca-maito@reactos.org>
Date: Fri, 5 Aug 2016 17:45:34 +0000
Subject: [PATCH] [COMCTL32]: Addendum to r72116: Add the __REACTOS__ ifdefs to
 ease wine syncing, and update the patch in accordance. CORE-11532

svn path=/trunk/; revision=72117
---
 reactos/dll/win32/comctl32/comctl32_ros.diff | 22 ++++++++++++++++++++
 reactos/dll/win32/comctl32/rebar.c           |  6 ++++++
 2 files changed, 28 insertions(+)

diff --git a/reactos/dll/win32/comctl32/comctl32_ros.diff b/reactos/dll/win32/comctl32/comctl32_ros.diff
index 92161375ada..40e0d553c84 100644
--- a/reactos/dll/win32/comctl32/comctl32_ros.diff
+++ b/reactos/dll/win32/comctl32/comctl32_ros.diff
@@ -848,6 +848,28 @@ diff -pudN e:\wine\dlls\comctl32/rebar.c e:\reactos\dll\win32\comctl32/rebar.c
      }
      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);
  
diff --git a/reactos/dll/win32/comctl32/rebar.c b/reactos/dll/win32/comctl32/rebar.c
index 47ff3ae223c..9210858f8b8 100644
--- a/reactos/dll/win32/comctl32/rebar.c
+++ b/reactos/dll/win32/comctl32/rebar.c
@@ -3378,7 +3378,11 @@ REBAR_NCHitTest (const REBAR_INFO *infoPtr, LPARAM lParam)
 			   (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 @@ REBAR_Paint (const REBAR_INFO *infoPtr, HDC hdc)
 {
     if (hdc) {
         TRACE("painting\n");
+#ifdef __REACTOS__
         REBAR_EraseBkGnd (infoPtr, hdc);
+#endif
         REBAR_Refresh (infoPtr, hdc);
     } else {
         PAINTSTRUCT ps;