[akhaldi] 61431: [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...

Author: akhaldi
Date: Thu Dec 26 19:11:46 2013
New Revision: 61431

URL: http://svn.reactos.org/svn/reactos?rev=61431&view=rev
Log:
[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

Modified:
    trunk/reactos/dll/win32/propsys/propstore.c
    trunk/reactos/dll/win32/propsys/propsys_main.c
    trunk/reactos/dll/win32/propsys/propsys_private.h
    trunk/reactos/dll/win32/propsys/propvar.c

Modified: trunk/reactos/dll/win32/propsys/propstore.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propstor…
==============================================================================
--- trunk/reactos/dll/win32/propsys/propstore.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/propsys/propstore.c	[iso-8859-1] Thu Dec 26 19:11:46 2013
@@ -18,30 +18,12 @@
  * 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;

Modified: trunk/reactos/dll/win32/propsys/propsys_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_…
==============================================================================
--- trunk/reactos/dll/win32/propsys/propsys_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/propsys/propsys_main.c	[iso-8859-1] Thu Dec 26 19:11:46 2013
@@ -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 "propsys_private.h"
+
 #include <rpcproxy.h>
-#include <propsys.h>
-#include <wine/debug.h>
-#include <wine/unicode.h>
-
-#include "propsys_private.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(propsys);
 
 static HINSTANCE propsys_hInstance;
 

Modified: trunk/reactos/dll/win32/propsys/propsys_private.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propsys_…
==============================================================================
--- trunk/reactos/dll/win32/propsys/propsys_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/propsys/propsys_private.h	[iso-8859-1] Thu Dec 26 19:11:46
2013
@@ -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;

Modified: trunk/reactos/dll/win32/propsys/propvar.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/propsys/propvar.…
==============================================================================
--- trunk/reactos/dll/win32/propsys/propvar.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/propsys/propvar.c	[iso-8859-1] Thu Dec 26 19:11:46 2013
@@ -18,27 +18,12 @@
  * 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 <stdarg.h>
+#include "propsys_private.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)