[akhaldi] 61717: [DEVENUM] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716

Author: akhaldi
Date: Mon Jan 20 11:22:40 2014
New Revision: 61717

URL: http://svn.reactos.org/svn/reactos?rev=61717&view=rev
Log:
[DEVENUM]
* Remove one time inclusions from the main header and put them back where they belong.
* Improve header inclusions.
CORE-7716

Modified:
    trunk/reactos/dll/directx/wine/devenum/createdevenum.c
    trunk/reactos/dll/directx/wine/devenum/devenum.rc
    trunk/reactos/dll/directx/wine/devenum/devenum_main.c
    trunk/reactos/dll/directx/wine/devenum/devenum_private.h
    trunk/reactos/dll/directx/wine/devenum/mediacatenum.c

Modified: trunk/reactos/dll/directx/wine/devenum/createdevenum.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/cr...
==============================================================================
--- trunk/reactos/dll/directx/wine/devenum/createdevenum.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/devenum/createdevenum.c	[iso-8859-1] Mon Jan 20 11:22:40 2014
@@ -24,7 +24,10 @@
  */

#include "devenum_private.h"
+
 #include <vfw.h>
+
+#include "resource.h"

extern HINSTANCE DEVENUM_hInstance;

Modified: trunk/reactos/dll/directx/wine/devenum/devenum.rc
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/de...
==============================================================================
--- trunk/reactos/dll/directx/wine/devenum/devenum.rc	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/devenum/devenum.rc	[iso-8859-1] Mon Jan 20 11:22:40 2014
@@ -18,10 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */

+#include <windef.h>
+
+#include "resource.h"
+
 #pragma code_page(65001)
-
-#include <windef.h>
-#include "resource.h"

LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT

Modified: trunk/reactos/dll/directx/wine/devenum/devenum_main.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/de...
==============================================================================
--- trunk/reactos/dll/directx/wine/devenum/devenum_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/devenum/devenum_main.c	[iso-8859-1] Mon Jan 20 11:22:40 2014
@@ -20,6 +20,7 @@
  */

#include "devenum_private.h"
+
 #include <rpcproxy.h>

DECLSPEC_HIDDEN LONG dll_refs;

Modified: trunk/reactos/dll/directx/wine/devenum/devenum_private.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/de...
==============================================================================
--- trunk/reactos/dll/directx/wine/devenum/devenum_private.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/devenum/devenum_private.h	[iso-8859-1] Mon Jan 20 11:22:40 2014
@@ -30,6 +30,7 @@
 #define _INC_WINDOWS
 #define COM_NO_WINDOWS_H

+#define COBJMACROS
 #define NONAMELESSSTRUCT
 #define NONAMELESSUNION

@@ -37,10 +38,8 @@
 #include <winbase.h>
 #include <wingdi.h>
 #include <winreg.h>
-
-#define COBJMACROS
-
-#include <ole2.h>
+#include <objbase.h>
+#include <oleidl.h>
 #include <strmif.h>
 #include <uuids.h>

@@ -50,8 +49,6 @@
 #ifndef RC_INVOKED
 #include <wine/unicode.h>
 #endif
-
-#include "resource.h"

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

Modified: trunk/reactos/dll/directx/wine/devenum/mediacatenum.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/devenum/me...
==============================================================================
--- trunk/reactos/dll/directx/wine/devenum/mediacatenum.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/devenum/mediacatenum.c	[iso-8859-1] Mon Jan 20 11:22:40 2014
@@ -23,7 +23,9 @@
  */

#include "devenum_private.h"
+
 #include <ocidl.h>
+#include <oleauto.h>

typedef struct
 {