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

Author: akhaldi
Date: Tue Jan 21 17:59:36 2014
New Revision: 61746

URL: http://svn.reactos.org/svn/reactos?rev=61746&view=rev
Log:
[COMDLG32]
* 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/comdlg32/cdlg.h
    trunk/reactos/dll/win32/comdlg32/filedlg.c
    trunk/reactos/dll/win32/comdlg32/printdlg.c

Modified: trunk/reactos/dll/win32/comdlg32/cdlg.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg.h?…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/cdlg.h	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/cdlg.h	[iso-8859-1] Tue Jan 21 17:59:36 2014
@@ -21,9 +21,8 @@
 #ifndef _WINE_DLL_CDLG_H
 #define _WINE_DLL_CDLG_H
 
-#include <config.h>
+#include <wine/config.h>
 
-#include <stdarg.h>
 #include <stdio.h>
 
 #define WIN32_NO_STATUS
@@ -38,18 +37,15 @@
 #include <winbase.h>
 #include <wingdi.h>
 #include <winuser.h>
-#include <winnls.h>
 #include <wincon.h>
 #include <winternl.h>
-#include <commctrl.h>
 #include <objbase.h>
 #include <commdlg.h>
 #include <shlobj.h>
-#include <shellapi.h>
 #include <dlgs.h>
 #include <cderr.h>
 
-// RegGetValueW is supported by Win2k3 SP1 but headers need Win Vista
+/* RegGetValueW is supported by Win2k3 SP1 but headers need Win Vista */
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0600
 #include <winreg.h>

Modified: trunk/reactos/dll/win32/comdlg32/filedlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/filedlg…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/filedlg.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/filedlg.c	[iso-8859-1] Tue Jan 21 17:59:36 2014
@@ -46,6 +46,8 @@
  */
 
 #include "cdlg.h"
+
+#include <shellapi.h>
 
 #define UNIMPLEMENTED_FLAGS \
 (OFN_DONTADDTORECENT |\

Modified: trunk/reactos/dll/win32/comdlg32/printdlg.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/printdl…
==============================================================================
--- trunk/reactos/dll/win32/comdlg32/printdlg.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/win32/comdlg32/printdlg.c	[iso-8859-1] Tue Jan 21 17:59:36 2014
@@ -23,6 +23,7 @@
  */
 
 #include "cdlg.h"
+
 #include <assert.h>
 #include <winspool.h>