From b3544fd00b9caf47b0e7d9d5a8c5aaa1097c63d3 Mon Sep 17 00:00:00 2001
From: Amine Khaldi <amine.khaldi@reactos.org>
Date: Sat, 9 Dec 2017 20:46:40 +0100
Subject: [PATCH] [BROWSEUI/SHELLBARS] Add a PCH.

---
 dll/win32/browseui/shellbars/CBandSiteMenu.cpp |  3 ++-
 dll/win32/browseui/shellbars/CISFBand.cpp      |  6 ++----
 dll/win32/browseui/shellbars/CISFBand.h        |  1 +
 dll/win32/browseui/shellbars/CMakeLists.txt    | 11 +++++++----
 dll/win32/browseui/shellbars/shellbars.h       | 12 ++++--------
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/dll/win32/browseui/shellbars/CBandSiteMenu.cpp b/dll/win32/browseui/shellbars/CBandSiteMenu.cpp
index d94038987f8..4f7af9b28f1 100644
--- a/dll/win32/browseui/shellbars/CBandSiteMenu.cpp
+++ b/dll/win32/browseui/shellbars/CBandSiteMenu.cpp
@@ -20,7 +20,8 @@
  */
 
 #include "shellbars.h"
-#include <strsafe.h>
+
+#include <browseui_undoc.h>
 
 /* The menu consists of 3 parts. The first is loaded from the resources,
    the second is populated with the classes of the CATID_DeskBand comcat
diff --git a/dll/win32/browseui/shellbars/CISFBand.cpp b/dll/win32/browseui/shellbars/CISFBand.cpp
index 24426f6ebda..670e647a23c 100644
--- a/dll/win32/browseui/shellbars/CISFBand.cpp
+++ b/dll/win32/browseui/shellbars/CISFBand.cpp
@@ -7,11 +7,9 @@
  */
 
 #include "shellbars.h"
-#include <commoncontrols.h>
-#include <strsafe.h>
 
-#define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
-#define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
+#include <commoncontrols.h>
+#include <shellapi.h>
 
 /*
 TODO:
diff --git a/dll/win32/browseui/shellbars/CISFBand.h b/dll/win32/browseui/shellbars/CISFBand.h
index 04e6811aeba..73882c3d85f 100644
--- a/dll/win32/browseui/shellbars/CISFBand.h
+++ b/dll/win32/browseui/shellbars/CISFBand.h
@@ -5,6 +5,7 @@
  * PURPOSE:     Quick Launch Toolbar (Taskbar Shell Extension)
  * PROGRAMMERS: Shriraj Sawant a.k.a SR13 <sr.official@hotmail.com>
  */
+
 #pragma once
 
 class CISFBand :
diff --git a/dll/win32/browseui/shellbars/CMakeLists.txt b/dll/win32/browseui/shellbars/CMakeLists.txt
index f42c74f722c..ec87d6ce244 100644
--- a/dll/win32/browseui/shellbars/CMakeLists.txt
+++ b/dll/win32/browseui/shellbars/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 PROJECT(SHELL)
 
 set_cpp(WITH_RUNTIME)
@@ -12,13 +13,15 @@ list(APPEND SOURCE
     CBandSiteMenu.cpp
     CBaseBar.cpp
     CISFBand.cpp
-    CSHEnumClassesOfCategories.cpp)
+    CSHEnumClassesOfCategories.cpp
+    shellbars.h)
 
 add_library(shellbars ${SOURCE})
-add_dependencies(shellbars xdk)
-
-target_link_libraries(shellbars atlnew)
 
 if(NOT MSVC)
     add_target_compile_flags(shellbars "-Wno-unused-but-set-variable")
 endif()
+
+add_pch(shellbars shellbars.h SOURCE)
+target_link_libraries(shellbars atlnew)
+add_dependencies(shellbars xdk)
diff --git a/dll/win32/browseui/shellbars/shellbars.h b/dll/win32/browseui/shellbars/shellbars.h
index b6ebf70d6c8..59221c4e286 100644
--- a/dll/win32/browseui/shellbars/shellbars.h
+++ b/dll/win32/browseui/shellbars/shellbars.h
@@ -7,10 +7,7 @@
 
 #include <windef.h>
 #include <winbase.h>
-#include <wincon.h>
-#include <wingdi.h>
 #include <shlobj.h>
-#include <shellapi.h>
 #include <shlobj_undoc.h>
 #include <shlguid_undoc.h>
 #include <shdeprecated.h>
@@ -19,13 +16,14 @@
 #include <atlcom.h>
 #include <atlwin.h>
 #include <atlsimpcoll.h>
-#include <undocuser.h>
 #include <shlwapi.h>
 #include <shlwapi_undoc.h>
 #include <undocshell.h>
 #include <shellutils.h>
-#include <browseui_undoc.h>
+#include <strsafe.h>
+
 #include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(browseui);
 
 #include "../resource.h"
 
@@ -33,8 +31,6 @@
 #include "CBandSiteMenu.h"
 #include "CISFBand.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(browseui);
-
 #define GET_X_LPARAM(lp) ((int)(short)LOWORD(lp))
 #define GET_Y_LPARAM(lp) ((int)(short)HIWORD(lp))
 
@@ -46,4 +42,4 @@ WINE_DEFAULT_DEBUG_CHANNEL(browseui);
 #define CISFBand_CreateInstance RSHELL_CISFBand_CreateInstance
 #endif
 
-#endif /* _BROWSEUI_PCH_ */
+#endif /* _SHELLBARS_PCH_ */
-- 
2.17.1