[ros-diffs] [akhaldi] 61339: [OBJSEL] * Improve header inclusions. * Move some inclusions to the main header. * Set the default debugging channel globally through the main header. * Remove inclusions and defin...

Author: akhaldi
Date: Sun Dec 22 18:01:43 2013
New Revision: 61339

URL: http://svn.reactos.org/svn/reactos?rev=61339&view=rev
Log:
[OBJSEL]
* Improve header inclusions.
* 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/objsel/factory.c
    trunk/reactos/dll/win32/objsel/objsel.c
    trunk/reactos/dll/win32/objsel/objsel_private.h

Modified: trunk/reactos/dll/win32/objsel/factory.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/factory.c?...
==============================================================================
--- trunk/reactos/dll/win32/objsel/factory.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/objsel/factory.c	[iso-8859-1] Sun Dec 22 18:01:43 2013
@@ -20,11 +20,6 @@
  */

#include "objsel_private.h"
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(objsel);
-

static inline ClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface)
 {

Modified: trunk/reactos/dll/win32/objsel/objsel.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel.c?r...
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/objsel/objsel.c	[iso-8859-1] Sun Dec 22 18:01:43 2013
@@ -20,10 +20,6 @@

#include "objsel_private.h"
 #include <rpcproxy.h>
-
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(objsel);

LONG dll_refs = 0;
 static HINSTANCE hInstance;

Modified: trunk/reactos/dll/win32/objsel/objsel_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/objsel/objsel_pri...
==============================================================================
--- trunk/reactos/dll/win32/objsel/objsel_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/objsel/objsel_private.h	[iso-8859-1] Sun Dec 22 18:01:43 2013
@@ -18,29 +18,21 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H

-//#include <string.h>
-#include <stdarg.h>
-//#include <stdio.h>
-//#include "winerror.h"
+#define COBJMACROS
+
 #include <windef.h>
 #include <winbase.h>
-//#include "winreg.h"
-//#include "wingdi.h"
-//#include "winuser.h"
+#include <objbase.h>
+#include <objsel.h>

-#define COBJMACROS
-
-#include <ole2.h>
-//#include "strmif.h"
-//#include "olectl.h"
-//#include "unknwn.h"
-#include <objsel.h>
-//#include "wine/unicode.h"
-//#include "uuids.h"
+#include <wine/debug.h>
+WINE_DEFAULT_DEBUG_CHANNEL(objsel);

/**********************************************************************
  * Dll lifetime tracking declaration for objsel.dll