[PATCH 4/5] shell32: Move explorer window messages definitions to shell32_main.h.

[Zebediah Figura]

Signed-off-by: Zebediah Figura 
---
 dlls/shell32/shell32_main.h | 22 ++++++++++++++++++++++
 dlls/shell32/undocshell.h   | 25 -------------------------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h
index b98629298aa..ea8019a85e2 100644
--- a/dlls/shell32/shell32_main.h
+++ b/dlls/shell32/shell32_main.h
@@ -268,4 +268,26 @@ static inline WCHAR *strdupAtoW(const char *str)
     return ret;
 }

+/* explorer ("cabinet") window messages */
+#define CWM_SETPATH             (WM_USER + 2)
+#define CWM_WANTIDLE            (WM_USER + 3)
+#define CWM_GETSETCURRENTINFO   (WM_USER + 4)
+#define CWM_SELECTITEM          (WM_USER + 5)
+#define CWM_SELECTITEMSTR       (WM_USER + 6)
+#define CWM_GETISHELLBROWSER    (WM_USER + 7)
+#define CWM_TESTPATH            (WM_USER + 9)
+#define CWM_STATECHANGE         (WM_USER + 10)
+#define CWM_GETPATH             (WM_USER + 12)
+
+/* CWM_TESTPATH types */
+#define CWTP_ISEQUAL  0
+#define CWTP_ISCHILD  1
+
+/* CWM_TESTPATH structure */
+typedef struct
+{
+    DWORD dwType;
+    ITEMIDLIST idl;
+} CWTESTPATHSTRUCT;
+
 #endif
diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h
index e4ed7c3630a..881832c5185 100644
--- a/dlls/shell32/undocshell.h
+++ b/dlls/shell32/undocshell.h
@@ -61,31 +61,6 @@ LPVOID WINAPI SHLockShared(

BOOL WINAPI SHUnlockShared(LPVOID pv);

-/****************************************************************************
- * Cabinet Window Messages
- */
-
-#define CWM_SETPATH           (WM_USER + 2)
-#define CWM_WANTIDLE	      (WM_USER + 3)
-#define CWM_GETSETCURRENTINFO (WM_USER + 4)
-#define CWM_SELECTITEM        (WM_USER + 5)
-#define CWM_SELECTITEMSTR     (WM_USER + 6)
-#define CWM_GETISHELLBROWSER  (WM_USER + 7)
-#define CWM_TESTPATH          (WM_USER + 9)
-#define CWM_STATECHANGE       (WM_USER + 10)
-#define CWM_GETPATH           (WM_USER + 12)
-
-/* CWM_TESTPATH types */
-#define CWTP_ISEQUAL  0
-#define CWTP_ISCHILD  1
-
-/* CWM_TESTPATH structure */
-typedef struct
-{
-	DWORD dwType;
-	ITEMIDLIST idl;
-} CWTESTPATHSTRUCT,* LPCWTESTPATHSTRUCT;
-
 /****************************************************************************
  * System Imagelist Routines
  */