https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6f19c83b96a899a7fda2500d139c7b8760791a12
commit 6f19c83b96a899a7fda2500d139c7b8760791a12 Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Mon Aug 28 11:28:08 2017 +0000 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Sat Oct 27 22:09:34 2018 +0200 [SETUPLIB] Move the files that implement utility functions into their own subdirectory. The files remaining in the main directory implement setup procedures that use the utility functions. svn path=/branches/setup_improvements/; revision=75695 --- base/setup/lib/CMakeLists.txt | 22 ++++++++++++---------- base/setup/lib/precomp.h | 2 +- base/setup/lib/setuplib.h | 24 ++++++++++++------------ base/setup/lib/{ => utils}/arcname.c | 0 base/setup/lib/{ => utils}/arcname.h | 0 base/setup/lib/{ => utils}/arcname_tests.c | 0 base/setup/lib/{ => utils}/bldrsup.c | 0 base/setup/lib/{ => utils}/bldrsup.h | 0 base/setup/lib/{ => utils}/filesup.c | 0 base/setup/lib/{ => utils}/filesup.h | 0 base/setup/lib/{ => utils}/genlist.c | 0 base/setup/lib/{ => utils}/genlist.h | 0 base/setup/lib/{ => utils}/infsupp.c | 0 base/setup/lib/{ => utils}/infsupp.h | 0 base/setup/lib/{ => utils}/inicache.c | 0 base/setup/lib/{ => utils}/inicache.h | 0 base/setup/lib/{ => utils}/linklist.h | 0 base/setup/lib/{ => utils}/ntverrsrc.c | 0 base/setup/lib/{ => utils}/ntverrsrc.h | 0 base/setup/lib/{ => utils}/osdetect.c | 0 base/setup/lib/{ => utils}/osdetect.h | 0 base/setup/lib/{ => utils}/partlist.c | 0 base/setup/lib/{ => utils}/partlist.h | 0 base/setup/lib/{ => utils}/regutil.c | 0 base/setup/lib/{ => utils}/regutil.h | 0 base/setup/usetup/genlist.h | 2 +- base/setup/usetup/inffile.h | 2 +- base/setup/usetup/partlist.h | 2 +- 28 files changed, 28 insertions(+), 26 deletions(-) diff --git a/base/setup/lib/CMakeLists.txt b/base/setup/lib/CMakeLists.txt index a1b9a90f36..30b53ff5b6 100644 --- a/base/setup/lib/CMakeLists.txt +++ b/base/setup/lib/CMakeLists.txt @@ -1,18 +1,20 @@ +include_directories(utils) + list(APPEND SOURCE - arcname.c - bldrsup.c + utils/arcname.c + utils/bldrsup.c + utils/filesup.c + utils/genlist.c + utils/infsupp.c + utils/inicache.c + utils/ntverrsrc.c + utils/osdetect.c + utils/partlist.c + utils/regutil.c bootsup.c - filesup.c fsutil.c - genlist.c - infsupp.c - inicache.c - ntverrsrc.c - osdetect.c - partlist.c registry.c - regutil.c setuplib.c precomp.h) diff --git a/base/setup/lib/precomp.h b/base/setup/lib/precomp.h index 0ce5c12e09..f347044d86 100644 --- a/base/setup/lib/precomp.h +++ b/base/setup/lib/precomp.h @@ -55,4 +55,4 @@ extern HANDLE ProcessHeap; #include "errorcode.h" -#include "linklist.h" +#include "utils/linklist.h" diff --git a/base/setup/lib/setuplib.h b/base/setup/lib/setuplib.h index 2d30fd0f72..4a0f623957 100644 --- a/base/setup/lib/setuplib.h +++ b/base/setup/lib/setuplib.h @@ -25,20 +25,20 @@ extern HANDLE ProcessHeap; #include "errorcode.h" -#include "linklist.h" -#include "ntverrsrc.h" -// #include "arcname.h" -#include "bldrsup.h" +#include "utils/linklist.h" +#include "utils/ntverrsrc.h" +// #include "utils/arcname.h" +#include "utils/bldrsup.h" #include "bootsup.h" -#include "filesup.h" +#include "utils/filesup.h" #include "fsutil.h" -#include "genlist.h" -#include "infsupp.h" -#include "inicache.h" -#include "partlist.h" -#include "arcname.h" -#include "osdetect.h" -#include "regutil.h" +#include "utils/genlist.h" +#include "utils/infsupp.h" +#include "utils/inicache.h" +#include "utils/partlist.h" +#include "utils/arcname.h" +#include "utils/osdetect.h" +#include "utils/regutil.h" #include "registry.h" diff --git a/base/setup/lib/arcname.c b/base/setup/lib/utils/arcname.c similarity index 100% rename from base/setup/lib/arcname.c rename to base/setup/lib/utils/arcname.c diff --git a/base/setup/lib/arcname.h b/base/setup/lib/utils/arcname.h similarity index 100% rename from base/setup/lib/arcname.h rename to base/setup/lib/utils/arcname.h diff --git a/base/setup/lib/arcname_tests.c b/base/setup/lib/utils/arcname_tests.c similarity index 100% rename from base/setup/lib/arcname_tests.c rename to base/setup/lib/utils/arcname_tests.c diff --git a/base/setup/lib/bldrsup.c b/base/setup/lib/utils/bldrsup.c similarity index 100% rename from base/setup/lib/bldrsup.c rename to base/setup/lib/utils/bldrsup.c diff --git a/base/setup/lib/bldrsup.h b/base/setup/lib/utils/bldrsup.h similarity index 100% rename from base/setup/lib/bldrsup.h rename to base/setup/lib/utils/bldrsup.h diff --git a/base/setup/lib/filesup.c b/base/setup/lib/utils/filesup.c similarity index 100% rename from base/setup/lib/filesup.c rename to base/setup/lib/utils/filesup.c diff --git a/base/setup/lib/filesup.h b/base/setup/lib/utils/filesup.h similarity index 100% rename from base/setup/lib/filesup.h rename to base/setup/lib/utils/filesup.h diff --git a/base/setup/lib/genlist.c b/base/setup/lib/utils/genlist.c similarity index 100% rename from base/setup/lib/genlist.c rename to base/setup/lib/utils/genlist.c diff --git a/base/setup/lib/genlist.h b/base/setup/lib/utils/genlist.h similarity index 100% rename from base/setup/lib/genlist.h rename to base/setup/lib/utils/genlist.h diff --git a/base/setup/lib/infsupp.c b/base/setup/lib/utils/infsupp.c similarity index 100% rename from base/setup/lib/infsupp.c rename to base/setup/lib/utils/infsupp.c diff --git a/base/setup/lib/infsupp.h b/base/setup/lib/utils/infsupp.h similarity index 100% rename from base/setup/lib/infsupp.h rename to base/setup/lib/utils/infsupp.h diff --git a/base/setup/lib/inicache.c b/base/setup/lib/utils/inicache.c similarity index 100% rename from base/setup/lib/inicache.c rename to base/setup/lib/utils/inicache.c diff --git a/base/setup/lib/inicache.h b/base/setup/lib/utils/inicache.h similarity index 100% rename from base/setup/lib/inicache.h rename to base/setup/lib/utils/inicache.h diff --git a/base/setup/lib/linklist.h b/base/setup/lib/utils/linklist.h similarity index 100% rename from base/setup/lib/linklist.h rename to base/setup/lib/utils/linklist.h diff --git a/base/setup/lib/ntverrsrc.c b/base/setup/lib/utils/ntverrsrc.c similarity index 100% rename from base/setup/lib/ntverrsrc.c rename to base/setup/lib/utils/ntverrsrc.c diff --git a/base/setup/lib/ntverrsrc.h b/base/setup/lib/utils/ntverrsrc.h similarity index 100% rename from base/setup/lib/ntverrsrc.h rename to base/setup/lib/utils/ntverrsrc.h diff --git a/base/setup/lib/osdetect.c b/base/setup/lib/utils/osdetect.c similarity index 100% rename from base/setup/lib/osdetect.c rename to base/setup/lib/utils/osdetect.c diff --git a/base/setup/lib/osdetect.h b/base/setup/lib/utils/osdetect.h similarity index 100% rename from base/setup/lib/osdetect.h rename to base/setup/lib/utils/osdetect.h diff --git a/base/setup/lib/partlist.c b/base/setup/lib/utils/partlist.c similarity index 100% rename from base/setup/lib/partlist.c rename to base/setup/lib/utils/partlist.c diff --git a/base/setup/lib/partlist.h b/base/setup/lib/utils/partlist.h similarity index 100% rename from base/setup/lib/partlist.h rename to base/setup/lib/utils/partlist.h diff --git a/base/setup/lib/regutil.c b/base/setup/lib/utils/regutil.c similarity index 100% rename from base/setup/lib/regutil.c rename to base/setup/lib/utils/regutil.c diff --git a/base/setup/lib/regutil.h b/base/setup/lib/utils/regutil.h similarity index 100% rename from base/setup/lib/regutil.h rename to base/setup/lib/utils/regutil.h diff --git a/base/setup/usetup/genlist.h b/base/setup/usetup/genlist.h index f6cdde32fd..0799a63ef7 100644 --- a/base/setup/usetup/genlist.h +++ b/base/setup/usetup/genlist.h @@ -26,7 +26,7 @@ #pragma once -#include "../lib/genlist.h" +// #include "../lib/utils/genlist.h" typedef struct _GENERIC_LIST_UI { diff --git a/base/setup/usetup/inffile.h b/base/setup/usetup/inffile.h index 90fb5e7d5f..9d33563a88 100644 --- a/base/setup/usetup/inffile.h +++ b/base/setup/usetup/inffile.h @@ -43,7 +43,7 @@ extern VOID InfSetHeap(PVOID Heap); #endif /* __REACTOS__ */ -#include <../lib/infsupp.h> +// #include "../lib/utils/infsupp.h" /* HELPER FUNCTIONS **********************************************************/ diff --git a/base/setup/usetup/partlist.h b/base/setup/usetup/partlist.h index ebb38167b9..c07b993497 100644 --- a/base/setup/usetup/partlist.h +++ b/base/setup/usetup/partlist.h @@ -25,7 +25,7 @@ #pragma once -#include "../lib/partlist.h" +// #include "../lib/utils/partlist.h" typedef enum _FORMATMACHINESTATE {
