From 85ca1a67fc375e380f3e2d5cbe7a451decf01ac8 Mon Sep 17 00:00:00 2001 From: Robert Naumann Date: Fri, 25 Mar 2016 23:54:55 +0000 Subject: [PATCH] [IERNONCE] Add resources, update file header, remove unneeded includes CORE-7194 svn path=/trunk/; revision=71048 --- reactos/dll/win32/iernonce/CMakeLists.txt | 1 + reactos/dll/win32/iernonce/iernonce.c | 8 ++----- reactos/dll/win32/iernonce/iernonce.rc | 19 +++++++++++++++ reactos/dll/win32/iernonce/lang/en-US.rc | 27 ++++++++++++++++++++++ reactos/dll/win32/iernonce/res/setup.ico | Bin 0 -> 22486 bytes reactos/dll/win32/iernonce/resource.h | 20 ++++++++++++++++ 6 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 reactos/dll/win32/iernonce/iernonce.rc create mode 100644 reactos/dll/win32/iernonce/lang/en-US.rc create mode 100644 reactos/dll/win32/iernonce/res/setup.ico create mode 100644 reactos/dll/win32/iernonce/resource.h diff --git a/reactos/dll/win32/iernonce/CMakeLists.txt b/reactos/dll/win32/iernonce/CMakeLists.txt index c06f2283536..7308f9a28f6 100644 --- 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 15a84af91b7..c5314c3f7c7 100644 --- 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 #include #include -#include -#include -#include #define NDEBUG #include diff --git a/reactos/dll/win32/iernonce/iernonce.rc b/reactos/dll/win32/iernonce/iernonce.rc new file mode 100644 index 00000000000..98fc1d43587 --- /dev/null +++ b/reactos/dll/win32/iernonce/iernonce.rc @@ -0,0 +1,19 @@ +#include +#include + +#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 + +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 index 00000000000..01c87bdb731 --- /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 index 0000000000000000000000000000000000000000..0ae7a7a2a1896ecd45a22a226631ce4b070eeaf9 GIT binary patch literal 22486 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 literal 0 HcmV?d00001 diff --git a/reactos/dll/win32/iernonce/resource.h b/reactos/dll/win32/iernonce/resource.h new file mode 100644 index 00000000000..e65158f1f25 --- /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