[PROPSYS]

* Move some inclusions to the main header.
* Set the default debugging channel globally through the main header.
* Remove inclusions and definitions that already exist in the main header.
CORE-7716

svn path=/trunk/; revision=61431

diff --git a/reactos/dll/win32/propsys/propstore.c b/reactos/dll/win32/propsys/propstore.c
index 7bb6de2..a738771 100644 (file)
--- a/reactos/dll/win32/propsys/propstore.c
+++ b/reactos/dll/win32/propsys/propstore.c
@@ -18,31 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-#include <config.h>
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-//#include "rpcproxy.h"
-#include <propsys.h>
-#include <wine/debug.h>
-//#include "wine/unicode.h"
+#include "propsys_private.h"
+
 #include <wine/list.h>
 
 #include <initguid.h>
-//#include "propsys_private.h"
-
 DEFINE_GUID(FMTID_NamedProperties, 0xd5cdd505, 0x2e9c, 0x101b, 0x93, 0x97, 0x08, 0x00, 0x2b, 0x2c, 0xf9, 0xae);
 
-WINE_DEFAULT_DEBUG_CHANNEL(propsys);
-
 typedef struct {
     struct list entry;
     DWORD pid;

diff --git a/reactos/dll/win32/propsys/propsys_main.c b/reactos/dll/win32/propsys/propsys_main.c
index 118a489..7a4cd61 100644 (file)
--- a/reactos/dll/win32/propsys/propsys_main.c
+++ b/reactos/dll/win32/propsys/propsys_main.c
@@ -19,26 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
-
-#define COBJMACROS
-#include <config.h>
-
-#include <stdarg.h>
-
-#include <windef.h>
-#include <winbase.h>
-#include <objbase.h>
-#include <rpcproxy.h>
-#include <propsys.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
 #include "propsys_private.h"
 
-WINE_DEFAULT_DEBUG_CHANNEL(propsys);
+#include <rpcproxy.h>
 
 static HINSTANCE propsys_hInstance;
 

diff --git a/reactos/dll/win32/propsys/propsys_private.h b/reactos/dll/win32/propsys/propsys_private.h
index 35bbb4d..092c8ba 100644 (file)
--- a/reactos/dll/win32/propsys/propsys_private.h
+++ b/reactos/dll/win32/propsys/propsys_private.h
@@ -18,4 +18,25 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <config.h>
+
+#include <stdarg.h>
+
+#define WIN32_NO_STATUS
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
+#define COBJMACROS
+#define NONAMELESSUNION
+
+#include <windef.h>
+#include <winbase.h>
+#include <objbase.h>
+#include <propsys.h>
+
+#include <wine/debug.h>
+#include <wine/unicode.h>
+
+WINE_DEFAULT_DEBUG_CHANNEL(propsys);
+
 HRESULT PropertyStore_CreateInstance(IUnknown *outer, REFIID riid, void **ppv) DECLSPEC_HIDDEN;

diff --git a/reactos/dll/win32/propsys/propvar.c b/reactos/dll/win32/propsys/propvar.c
index 117d7f5..2a9a69c 100644 (file)
--- a/reactos/dll/win32/propsys/propvar.c
+++ b/reactos/dll/win32/propsys/propvar.c
@@ -18,28 +18,13 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WIN32_NO_STATUS
-#define _INC_WINDOWS
-#define COM_NO_WINDOWS_H
+#include "propsys_private.h"
 
-//#include <stdarg.h>
 #include <stdio.h>
-
-#define NONAMELESSUNION
-
-#include <windef.h>
-#include <winbase.h>
-//#include "winerror.h"
 #include <winreg.h>
-//#include "winuser.h"
-#include <shlobj.h>
+#include <oleauto.h>
 #include <propvarutil.h>
 
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(propsys);
-
 static HRESULT PROPVAR_ConvertFILETIME(PROPVARIANT *ppropvarDest,
                                        REFPROPVARIANT propvarSrc, VARTYPE vt)
 {