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

Author: akhaldi
Date: Fri Jan 24 18:00:48 2014
New Revision: 61789

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

Modified:
    trunk/reactos/dll/win32/msports/classinst.c
    trunk/reactos/dll/win32/msports/internal.h
    trunk/reactos/dll/win32/msports/precomp.h

Modified: trunk/reactos/dll/win32/msports/classinst.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/classins…
==============================================================================
--- trunk/reactos/dll/win32/msports/classinst.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msports/classinst.c	[iso-8859-1] Fri Jan 24 18:00:48 2014
@@ -7,6 +7,11 @@
  */
 
 #include "precomp.h"
+
+#include <wchar.h>
+
+#define NTOS_MODE_USER
+#include <ndk/cmtypes.h>
 
 typedef enum _PORT_TYPE
 {

Modified: trunk/reactos/dll/win32/msports/internal.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/internal…
==============================================================================
--- trunk/reactos/dll/win32/msports/internal.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msports/internal.h	[iso-8859-1] Fri Jan 24 18:00:48 2014
@@ -6,4 +6,4 @@
  * COPYRIGHT:   Copyright 2011 Eric Kohl
  */
 
-extern HINSTANCE hInstance;
+extern HINSTANCE hInstance;

Modified: trunk/reactos/dll/win32/msports/precomp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msports/precomp.…
==============================================================================
--- trunk/reactos/dll/win32/msports/precomp.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msports/precomp.h	[iso-8859-1] Fri Jan 24 18:00:48 2014
@@ -1,16 +1,19 @@
+#include <stdarg.h>
+
 #define WIN32_NO_STATUS
-#include <stdarg.h>
+#define _INC_WINDOWS
+#define COM_NO_WINDOWS_H
+
 #include <windef.h>
 #include <winbase.h>
 #include <winreg.h>
 #include <winuser.h>
-#include <wchar.h>
-#include <cmtypes.h>
 #include <msports.h>
 #include <setupapi.h>
 
 #include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(msports);
 
 #include "internal.h"
 #include "resource.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(msports);