[SETUPLIB][USETUP] Move some code to the SetupLib.

[reactos.git] / base / setup / usetup / usetup.h

diff --git a/base/setup/usetup/usetup.h b/base/setup/usetup/usetup.h
index 37cae20..eeb1154 100644 (file)
--- a/base/setup/usetup/usetup.h
+++ b/base/setup/usetup/usetup.h
@@ -21,7 +21,7 @@
  * PROJECT:         ReactOS text-mode setup
  * FILE:            base/setup/usetup/usetup.h
  * PURPOSE:         Text-mode setup
- * PROGRAMMER:      Eric Kohl
+ * PROGRAMMER:
  */
 
 #ifndef _USETUP_PCH_
@@ -39,8 +39,6 @@
 #include <winuser.h>
 #include <wincon.h>
 
-#include <strsafe.h>
-
 #define NTOS_MODE_USER
 #include <ndk/cmfuncs.h>
 #include <ndk/exfuncs.h>
@@ -52,16 +50,16 @@
 #include <ndk/rtlfuncs.h>
 #include <ndk/setypes.h>
 
-/* Filesystem headers */
+#include <ntstrsafe.h>
+
+/* Setup library headers */
 #include <reactos/rosioctl.h>
-#include <fslib/vfatlib.h>
-#include <fslib/ext2lib.h>
-// #include <fslib/ntfslib.h>
+#include <../lib/setuplib.h>
+// #include "errorcode.h"
 
 /* Internal Headers */
 #include "consup.h"
 #include "inffile.h"
-#include "inicache.h"
 #include "progress.h"
 #include "infros.h"
 #include "filequeue.h"
@@ -72,7 +70,6 @@
 #include "filesup.h"
 #include "genlist.h"
 #include "mui.h"
-#include "errorcode.h"
 
 extern HANDLE ProcessHeap;
 extern UNICODE_STRING SourceRootPath;
@@ -159,22 +156,4 @@ typedef enum _PAGE_NUMBER
 #define POPUP_WAIT_ANY_KEY 1
 #define POPUP_WAIT_ENTER   2
 
-#define InsertAscendingList(ListHead, NewEntry, Type, ListEntryField, SortField)\
-{\
-  PLIST_ENTRY current;\
-\
-  current = (ListHead)->Flink;\
-  while (current != (ListHead))\
-  {\
-    if (CONTAINING_RECORD(current, Type, ListEntryField)->SortField >=\
-        (NewEntry)->SortField)\
-    {\
-      break;\
-    }\
-    current = current->Flink;\
-  }\
-\
-  InsertTailList(current, &((NewEntry)->ListEntryField));\
-}
-
 #endif /* _USETUP_PCH_ */