From b4fc288d14b2fbfe727ce7985931674bb1a92740 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Sun, 6 Nov 2005 23:32:41 +0000
Subject: [PATCH] Add missing files to revision 19031

svn path=/trunk/; revision=19032
---
 reactos/lib/setupapi/En.rc              | 8 +++++++-
 reactos/lib/setupapi/resource.h         | 7 +++++++
 reactos/lib/setupapi/setupapi.rc        | 7 ++-----
 reactos/lib/setupapi/setupapi_private.h | 5 -----
 4 files changed, 16 insertions(+), 11 deletions(-)
 create mode 100644 reactos/lib/setupapi/resource.h

diff --git a/reactos/lib/setupapi/En.rc b/reactos/lib/setupapi/En.rc
index aa504ca13d8..c341acfa31b 100644
--- a/reactos/lib/setupapi/En.rc
+++ b/reactos/lib/setupapi/En.rc
@@ -18,7 +18,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105
 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION
@@ -32,3 +32,9 @@ BEGIN
 	LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP
 	CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP
 END
+
+STRINGTABLE DISCARDABLE
+BEGIN
+	IDS_QUERY_REBOOT_TEXT        "Your computer needs to be rebooted to finish installation. Do you want to proceed?"
+	IDS_QUERY_REBOOT_CAPTION     "Reboot"
+END
diff --git a/reactos/lib/setupapi/resource.h b/reactos/lib/setupapi/resource.h
new file mode 100644
index 00000000000..bbb37ccc504
--- /dev/null
+++ b/reactos/lib/setupapi/resource.h
@@ -0,0 +1,7 @@
+#define IDS_QUERY_REBOOT_TEXT    1
+#define IDS_QUERY_REBOOT_CAPTION 2
+
+#define COPYFILEDLGORD           1000
+#define SOURCESTRORD             500
+#define DESTSTRORD               501
+#define PROGRESSORD              502
diff --git a/reactos/lib/setupapi/setupapi.rc b/reactos/lib/setupapi/setupapi.rc
index c6b64406e76..2930b58c633 100644
--- a/reactos/lib/setupapi/setupapi.rc
+++ b/reactos/lib/setupapi/setupapi.rc
@@ -18,11 +18,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "windef.h"
-#include "winbase.h"
-#include "winuser.h"
-#include "winnls.h"
-#include "setupapi_private.h"
+#include <windows.h>
+#include "resource.h"
 
 #include "Bg.rc"
 #include "Cs.rc"
diff --git a/reactos/lib/setupapi/setupapi_private.h b/reactos/lib/setupapi/setupapi_private.h
index 8e154232f44..ef982feaab2 100644
--- a/reactos/lib/setupapi/setupapi_private.h
+++ b/reactos/lib/setupapi/setupapi_private.h
@@ -139,11 +139,6 @@ struct DeviceInfoSet /* HDEVINFO */
     LIST_ENTRY ListHead; /* List of struct DeviceInfoElement */
 };
 
-#define COPYFILEDLGORD	1000
-#define SOURCESTRORD	500
-#define DESTSTRORD	501
-#define PROGRESSORD	502
-
 extern HINSTANCE hInstance;
 #define RC_STRING_MAX_SIZE 256