Author: akhaldi Date: Mon Jan 13 13:07:50 2014 New Revision: 61612
URL: http://svn.reactos.org/svn/reactos?rev=61612&view=rev Log: [DISKPART] * Remove one time inclusions from the main header and put them back where they belong. * Cleanup the main header. CORE-7716
Modified: trunk/reactos/base/system/diskpart/assign.c trunk/reactos/base/system/diskpart/attach.c trunk/reactos/base/system/diskpart/attributes.c trunk/reactos/base/system/diskpart/automount.c trunk/reactos/base/system/diskpart/break.c trunk/reactos/base/system/diskpart/clean.c trunk/reactos/base/system/diskpart/compact.c trunk/reactos/base/system/diskpart/convert.c trunk/reactos/base/system/diskpart/create.c trunk/reactos/base/system/diskpart/delete.c trunk/reactos/base/system/diskpart/detach.c trunk/reactos/base/system/diskpart/detail.c trunk/reactos/base/system/diskpart/diskpart.c trunk/reactos/base/system/diskpart/diskpart.h trunk/reactos/base/system/diskpart/diskpart.rc trunk/reactos/base/system/diskpart/expand.c trunk/reactos/base/system/diskpart/extend.c trunk/reactos/base/system/diskpart/filesystems.c trunk/reactos/base/system/diskpart/format.c trunk/reactos/base/system/diskpart/gpt.c trunk/reactos/base/system/diskpart/import.c trunk/reactos/base/system/diskpart/inactive.c trunk/reactos/base/system/diskpart/list.c trunk/reactos/base/system/diskpart/merge.c trunk/reactos/base/system/diskpart/offline.c trunk/reactos/base/system/diskpart/online.c trunk/reactos/base/system/diskpart/recover.c trunk/reactos/base/system/diskpart/remove.c trunk/reactos/base/system/diskpart/repair.c trunk/reactos/base/system/diskpart/rescan.c trunk/reactos/base/system/diskpart/retain.c trunk/reactos/base/system/diskpart/san.c trunk/reactos/base/system/diskpart/select.c trunk/reactos/base/system/diskpart/setid.c trunk/reactos/base/system/diskpart/shrink.c trunk/reactos/base/system/diskpart/uniqueid.c
Modified: trunk/reactos/base/system/diskpart/assign.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/assign... ============================================================================== --- trunk/reactos/base/system/diskpart/assign.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/assign.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -5,6 +5,7 @@ * PURPOSE: Manages all the partitions of the OS in an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL assign_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/attach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/attach... ============================================================================== --- trunk/reactos/base/system/diskpart/attach.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/attach.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -5,6 +5,7 @@ * PURPOSE: Manages all the partitions of the OS in an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL attach_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/attributes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/attrib... ============================================================================== --- trunk/reactos/base/system/diskpart/attributes.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/attributes.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -5,6 +5,7 @@ * PURPOSE: Manages all the partitions of the OS in an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL attributes_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/automount.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/automo... ============================================================================== --- trunk/reactos/base/system/diskpart/automount.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/automount.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -5,6 +5,7 @@ * PURPOSE: Manages all the partitions of the OS in an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL automount_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/break.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/break.... ============================================================================== --- trunk/reactos/base/system/diskpart/break.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/break.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL break_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/clean.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/clean.... ============================================================================== --- trunk/reactos/base/system/diskpart/clean.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/clean.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL clean_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/compact.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/compac... ============================================================================== --- trunk/reactos/base/system/diskpart/compact.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/compact.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL compact_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/conver... ============================================================================== --- trunk/reactos/base/system/diskpart/convert.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/convert.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL convert_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/create... ============================================================================== --- trunk/reactos/base/system/diskpart/create.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/create.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL create_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/delete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/delete... ============================================================================== --- trunk/reactos/base/system/diskpart/delete.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/delete.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL delete_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/detach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/detach... ============================================================================== --- trunk/reactos/base/system/diskpart/detach.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/detach.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL detach_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/detail.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/detail... ============================================================================== --- trunk/reactos/base/system/diskpart/detail.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/detail.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL detail_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/diskpart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskpa... ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -8,7 +8,13 @@ */
/* INCLUDES ******************************************************************/ + #include "diskpart.h" + +#include <stdlib.h> +#include <winbase.h> +#include <wincon.h> +#include <winuser.h>
/* FUNCTIONS ******************************************************************/ VOID
Modified: trunk/reactos/base/system/diskpart/diskpart.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskpa... ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.h [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,19 +6,16 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #ifndef DISKPART_H #define DISKPART_H
/* INCLUDES ******************************************************************/
+#include <stdio.h> + #define WIN32_NO_STATUS -#include <stdarg.h> #include <windef.h> -#include <winbase.h> -#include <wincon.h> -#include <winuser.h> -#include <stdio.h> -#include <stdlib.h>
#include "resource.h"
Modified: trunk/reactos/base/system/diskpart/diskpart.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskpa... ============================================================================== --- trunk/reactos/base/system/diskpart/diskpart.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/diskpart.rc [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -19,4 +19,4 @@ #endif #ifdef LANGUAGE_SQ_AL #include "lang/sq-AL.rc" -#endif +#endif
Modified: trunk/reactos/base/system/diskpart/expand.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/expand... ============================================================================== --- trunk/reactos/base/system/diskpart/expand.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/expand.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL expand_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/extend.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/extend... ============================================================================== --- trunk/reactos/base/system/diskpart/extend.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/extend.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL extend_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/filesystems.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/filesy... ============================================================================== --- trunk/reactos/base/system/diskpart/filesystems.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/filesystems.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL filesystems_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/format.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/format... ============================================================================== --- trunk/reactos/base/system/diskpart/format.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/format.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL format_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/gpt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/gpt.c?... ============================================================================== --- trunk/reactos/base/system/diskpart/gpt.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/gpt.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL gpt_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/import.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/import... ============================================================================== --- trunk/reactos/base/system/diskpart/import.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/import.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL import_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/inactive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/inacti... ============================================================================== --- trunk/reactos/base/system/diskpart/inactive.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/inactive.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL inactive_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/list.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/list.c... ============================================================================== --- trunk/reactos/base/system/diskpart/list.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/list.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
static VOID list_disk(VOID)
Modified: trunk/reactos/base/system/diskpart/merge.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/merge.... ============================================================================== --- trunk/reactos/base/system/diskpart/merge.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/merge.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL merge_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/offline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/offlin... ============================================================================== --- trunk/reactos/base/system/diskpart/offline.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/offline.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL offline_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/online.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/online... ============================================================================== --- trunk/reactos/base/system/diskpart/online.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/online.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL online_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/recover.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/recove... ============================================================================== --- trunk/reactos/base/system/diskpart/recover.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/recover.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL recover_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/remove.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/remove... ============================================================================== --- trunk/reactos/base/system/diskpart/remove.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/remove.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL remove_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/repair.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/repair... ============================================================================== --- trunk/reactos/base/system/diskpart/repair.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/repair.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL repair_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/rescan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/rescan... ============================================================================== --- trunk/reactos/base/system/diskpart/rescan.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/rescan.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL rescan_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/retain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/retain... ============================================================================== --- trunk/reactos/base/system/diskpart/retain.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/retain.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL retain_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/san.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/san.c?... ============================================================================== --- trunk/reactos/base/system/diskpart/san.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/san.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL san_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/select... ============================================================================== --- trunk/reactos/base/system/diskpart/select.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/select.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL select_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/setid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/setid.... ============================================================================== --- trunk/reactos/base/system/diskpart/setid.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/setid.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL setid_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/shrink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/shrink... ============================================================================== --- trunk/reactos/base/system/diskpart/shrink.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/shrink.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL shrink_main(INT argc, LPWSTR *argv)
Modified: trunk/reactos/base/system/diskpart/uniqueid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/unique... ============================================================================== --- trunk/reactos/base/system/diskpart/uniqueid.c [iso-8859-1] (original) +++ trunk/reactos/base/system/diskpart/uniqueid.c [iso-8859-1] Mon Jan 13 13:07:50 2014 @@ -6,6 +6,7 @@ * an interactive way * PROGRAMMERS: Lee Schroeder */ + #include "diskpart.h"
BOOL uniqueid_main(INT argc, LPWSTR *argv)