[IERNONCE] Add resources, update file header, remove unneeded includes CORE-7194

svn path=/trunk/; revision=71048

diff --git a/reactos/dll/win32/iernonce/CMakeLists.txt b/reactos/dll/win32/iernonce/CMakeLists.txt
index c06f228..7308f9a 100644 (file)
--- a/reactos/dll/win32/iernonce/CMakeLists.txt
+++ b/reactos/dll/win32/iernonce/CMakeLists.txt
@@ -3,6 +3,7 @@ spec2def(iernonce.dll iernonce.spec)
 
 add_library(iernonce SHARED
     iernonce.c
+    iernonce.rc
     ${CMAKE_CURRENT_BINARY_DIR}/iernonce.def)
 
 set_module_type(iernonce win32dll UNICODE)

diff --git a/reactos/dll/win32/iernonce/iernonce.c b/reactos/dll/win32/iernonce/iernonce.c
index 15a84af..c5314c3 100644 (file)
--- a/reactos/dll/win32/iernonce/iernonce.c
+++ b/reactos/dll/win32/iernonce/iernonce.c
@@ -2,18 +2,14 @@
  * PROJECT:     ReactOS system libraries
  * LICENSE:     GPL - See COPYING in the top level directory
  * FILE:        dll\win32\iernonce\iernonce.c
- * PURPOSE:     DLL for RunOnceEx Keys
- * PROGRAMMERS: Copyright 2013 Robert Naumann
+ * PURPOSE:     ReactOS Extended RunOnce processing with UI
+ * PROGRAMMERS: Copyright 2013-2016 Robert Naumann
  */
 
 
 #define WIN32_NO_STATUS
-#include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
-#include <winreg.h>
-#include <winuser.h>
-#include <setupapi.h>
 
 #define NDEBUG
 #include <debug.h>

diff --git a/reactos/dll/win32/iernonce/iernonce.rc b/reactos/dll/win32/iernonce/iernonce.rc
new file mode 100644 (file)
index 0000000..98fc1d4
--- /dev/null
+++ b/reactos/dll/win32/iernonce/iernonce.rc
@@ -0,0 +1,19 @@
+#include <windef.h>
+#include <winuser.h>
+
+#include "resource.h"
+
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Extended RunOnce processing with UI"
+#define REACTOS_STR_INTERNAL_NAME     "iernonce"
+#define REACTOS_STR_ORIGINAL_FILENAME "iernonce.dll"
+#include <reactos/version.rc>
+
+IDI_ICON ICON "res/setup.ico"
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
+#endif

diff --git a/reactos/dll/win32/iernonce/lang/en-US.rc b/reactos/dll/win32/iernonce/lang/en-US.rc
new file mode 100644 (file)
index 0000000..01c87bd
--- /dev/null
+++ b/reactos/dll/win32/iernonce/lang/en-US.rc
@@ -0,0 +1,27 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE
+BEGIN
+    IDS_INVALIDFORMAT "The format of the %1 RunEx or RunOnceEx entry was invalid. A vertical bar ('|') is needed after the function name and the function needs to support WinMain() parameters."
+    IDS_LOADERROR "An error occurred loading %1. The file may not have been installed or it has been corrupted."
+    IDS_CALLERROR "An error or exception occurred while calling the function %1 in %2."
+    IDS_INCORRECTFORMAT "The format of the following RunEx or RunOnceEx command is incorrect: %1. The shell execute command must start with ||."
+    IDS_NOEXPORT "Unable to call the function %1 in the file %2 because that function does not exist or is not exported."
+    IDS_EXECUTEERROR "An error or exception occurred while executing %1."
+    IDS_NOFUNCTION "Unable to find the function %1 in the file %2."
+    IDS_NODEPENDENCY "Unable to load the dependency file %1."
+    IDS_SETUPERROR "An error has occurred while setting up %1. This error has been logged, the installation will continue"
+    IDS_INCOMPLETE "The previous installation of an application has not been completed.\n\nLogon with an Administrator account to complete the installation."
+    IDS_SETUP "ReactOS Setup"
+    IDS_SERVICEERROR "Some services could not be started. Setup needs to restart your system in order to start the services."
+END
+
+IDD_DIALOG DIALOGEX 0, 0, 206, 166
+STYLE DS_MODALFRAME | DS_NOIDLEMSG | WS_POPUP | WS_VISIBLE | WS_CAPTION
+CAPTION "ReactOS Setup"
+FONT 8, "MS Shell Dlg"
+BEGIN
+    LTEXT "ReactOS is now setting up the following items:", -1, 36, 13, 163, 11
+    LISTBOX IDC_LB_ITEMS, 36, 32, 163, 127, LBS_NOTIFY | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_CHILD | WS_VISIBLE | WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+    ICON IDI_ICON, -1, 7, 7, 20, 20
+END

diff --git a/reactos/dll/win32/iernonce/res/setup.ico b/reactos/dll/win32/iernonce/res/setup.ico
new file mode 100644 (file)
index 0000000..0ae7a7a
Binary files /dev/null and b/reactos/dll/win32/iernonce/res/setup.ico differ

diff --git a/reactos/dll/win32/iernonce/resource.h b/reactos/dll/win32/iernonce/resource.h
new file mode 100644 (file)
index 0000000..e65158f
--- /dev/null
+++ b/reactos/dll/win32/iernonce/resource.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#define IDI_ICON 1
+
+#define IDD_DIALOG 1999
+
+#define IDC_LB_ITEMS 2009
+
+#define IDS_INVALIDFORMAT 100
+#define IDS_LOADERROR 101
+#define IDS_CALLERROR 102
+#define IDS_INCORRECTFORMAT 103
+#define IDS_NOEXPORT 104
+#define IDS_EXECUTEERROR 105
+#define IDS_NOFUNCTION 106
+#define IDS_NODEPENDENCY 107
+#define IDS_SETUPERROR 108
+#define IDS_INCOMPLETE 109
+#define IDS_SETUP 110
+#define IDS_SERVICEERROR 111